diff --git a/deps/watchdog/Watchdog.h b/deps/watchdog/Watchdog.h index 08cc06788..7d5e98037 100644 --- a/deps/watchdog/Watchdog.h +++ b/deps/watchdog/Watchdog.h @@ -32,14 +32,8 @@ #include - // fucking filesystem -#if _MSC_VER >= 1925 #include namespace ci { namespace fs = std::filesystem; } -#else -#include -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 index c21f0ddd0..c1697b23b 100644 --- a/src/api/main.cpp +++ b/src/api/main.cpp @@ -31,14 +31,8 @@ #include -// fucking filesystem -#if _MSC_VER >= 1925 #include namespace fs = std::filesystem; -#else -#include -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 index 5d95e17f7..52808aac8 100644 --- a/src/common/Config/ConfigMgr.cpp +++ b/src/common/Config/ConfigMgr.cpp @@ -2,13 +2,8 @@ #include #include -#if _MSC_VER >= 1925 #include namespace fs = std::filesystem; -#else -#include -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; -} \ No newline at end of file +} diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp index 828671992..9fc6b37bc 100644 --- a/src/common/Logging/Logger.cpp +++ b/src/common/Logging/Logger.cpp @@ -8,13 +8,8 @@ #include // #include -#if _MSC_VER >= 1925 #include namespace fs = std::filesystem; -#else -#include -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 index 0f7062127..31ef313c3 100644 --- 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 namespace fs = std::filesystem; -#else -#include -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 index 7eaff9031..dd28ef9f0 100644 --- 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 namespace filesys = std::filesystem; -#else -#include -namespace filesys = std::experimental::filesystem; -#endif #include #include