From 56ac73be3660e9d786fd6afe6deb6abdd83fe0f8 Mon Sep 17 00:00:00 2001 From: Levin Li Date: Tue, 23 Jun 2020 18:11:54 +0800 Subject: [PATCH] Replace is_directory checking method --- src/celengine/virtualtex.cpp | 3 ++- src/celestia/celestiacore.cpp | 3 ++- src/celscript/lua/luascript.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/celengine/virtualtex.cpp b/src/celengine/virtualtex.cpp index 7cd857fb5..5f15c1eb3 100644 --- a/src/celengine/virtualtex.cpp +++ b/src/celengine/virtualtex.cpp @@ -261,7 +261,8 @@ void VirtualTexture::populateTileTree() for (int i = 0; i < MaxResolutionLevels; i++) { fs::path path = tilePath / fmt::sprintf("level%d", i); - if (fs::is_directory(path)) + std::error_code ec; + if (fs::is_directory(path, ec)) { maxLevel = i + baseSplit; int uLimit = 2 << maxLevel; diff --git a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp index 6365e057c..a6d0b72c2 100644 --- a/src/celestia/celestiacore.cpp +++ b/src/celestia/celestiacore.cpp @@ -100,7 +100,8 @@ static bool is_valid_directory(const fs::path& dir) if (dir.empty()) return false; - if (!is_directory(dir)) + std::error_code ec; + if (!fs::is_directory(dir, ec)) { fmt::fprintf(cerr, "Path %s doesn't exist or isn't a directory", dir); return false; diff --git a/src/celscript/lua/luascript.cpp b/src/celscript/lua/luascript.cpp index 605ee5bb7..7eaf2f020 100644 --- a/src/celscript/lua/luascript.cpp +++ b/src/celscript/lua/luascript.cpp @@ -165,7 +165,8 @@ static string lua_path(const CelestiaConfig *config) if (dir.empty()) continue; - if (!is_directory(dir)) + std::error_code ec; + if (!fs::is_directory(dir, ec)) { fmt::fprintf(cerr, "Path %s doesn't exist or isn't a directory", dir); continue;