Remove pre-C++17 Filesystem library support

SapphireServer · Aug 9, 2024 · 2e353fd · 2e353fd
1 parent 2a0e423
commit 2e353fd
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 35 deletions.
diff --git a/deps/watchdog/Watchdog.h b/deps/watchdog/Watchdog.h
@@ -32,14 +32,8 @@
 
 #include <functional>
 
- // fucking filesystem
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace ci { namespace fs = std::filesystem; }
-#else
-#include <experimental/filesystem>
-namespace ci { namespace fs = std::experimental::filesystem; }
-#endif
 
 //! Exception for when Watchdog can't locate a file or parse the wildcard
 class WatchedFileSystemExc : public std::exception {

diff --git a/src/api/main.cpp b/src/api/main.cpp
@@ -31,14 +31,8 @@
 #include <Util/CrashHandler.h>
 
 
-// fucking filesystem
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 
 Sapphire::Common::Util::CrashHandler crashHandler;

diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
@@ -2,13 +2,8 @@
 #include <iostream>
 #include <fstream>
 
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
@@ -94,4 +89,4 @@ bool ConfigMgr::copyDefaultConfig( const std::string& configName )
   fs::copy_file( configPath.string() + m_configDefaultSuffix, configPath );
 
   return true;
-}
+}
diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
@@ -8,13 +8,8 @@
 #include <spdlog/sinks/daily_file_sink.h>
 
 // #include <iostream>
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 
 void Sapphire::Logger::init( const std::string& logPath )

diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
@@ -11,14 +11,8 @@
 using namespace Sapphire;
 using namespace Sapphire::Common;
 
-// fucking filesystem
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 
 DbManager::DbManager( const std::string& host, const std::string& database, const std::string& user, const std::string& pw, uint16_t port ) :

diff --git a/src/dbm/main.cpp b/src/dbm/main.cpp
@@ -9,14 +9,8 @@
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
-// fucking filesystem
-#if _MSC_VER >= 1925
 #include <filesystem>
 namespace filesys = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace filesys = std::experimental::filesystem;
-#endif
 
 #include <fstream>
 #include <streambuf>