mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-23 13:17:45 +00:00
Remove pre-C++17 Filesystem library support
This commit is contained in:
parent
2a0e423051
commit
2e353fd473
6 changed files with 1 additions and 35 deletions
6
deps/watchdog/Watchdog.h
vendored
6
deps/watchdog/Watchdog.h
vendored
|
@ -32,14 +32,8 @@
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
// fucking filesystem
|
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace ci { namespace fs = std::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
|
//! Exception for when Watchdog can't locate a file or parse the wildcard
|
||||||
class WatchedFileSystemExc : public std::exception {
|
class WatchedFileSystemExc : public std::exception {
|
||||||
|
|
|
@ -31,14 +31,8 @@
|
||||||
#include <Util/CrashHandler.h>
|
#include <Util/CrashHandler.h>
|
||||||
|
|
||||||
|
|
||||||
// fucking filesystem
|
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
#else
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
namespace fs = std::experimental::filesystem;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
Sapphire::Common::Util::CrashHandler crashHandler;
|
Sapphire::Common::Util::CrashHandler crashHandler;
|
||||||
|
|
|
@ -2,13 +2,8 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
#else
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
namespace fs = std::experimental::filesystem;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace Sapphire;
|
using namespace Sapphire;
|
||||||
using namespace Sapphire::Common;
|
using namespace Sapphire::Common;
|
||||||
|
@ -94,4 +89,4 @@ bool ConfigMgr::copyDefaultConfig( const std::string& configName )
|
||||||
fs::copy_file( configPath.string() + m_configDefaultSuffix, configPath );
|
fs::copy_file( configPath.string() + m_configDefaultSuffix, configPath );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,8 @@
|
||||||
#include <spdlog/sinks/daily_file_sink.h>
|
#include <spdlog/sinks/daily_file_sink.h>
|
||||||
|
|
||||||
// #include <iostream>
|
// #include <iostream>
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
#else
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
namespace fs = std::experimental::filesystem;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
void Sapphire::Logger::init( const std::string& logPath )
|
void Sapphire::Logger::init( const std::string& logPath )
|
||||||
|
|
|
@ -11,14 +11,8 @@
|
||||||
using namespace Sapphire;
|
using namespace Sapphire;
|
||||||
using namespace Sapphire::Common;
|
using namespace Sapphire::Common;
|
||||||
|
|
||||||
// fucking filesystem
|
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace fs = std::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 ) :
|
DbManager::DbManager( const std::string& host, const std::string& database, const std::string& user, const std::string& pw, uint16_t port ) :
|
||||||
|
|
|
@ -9,14 +9,8 @@
|
||||||
|
|
||||||
Sapphire::Common::Util::CrashHandler crashHandler;
|
Sapphire::Common::Util::CrashHandler crashHandler;
|
||||||
|
|
||||||
// fucking filesystem
|
|
||||||
#if _MSC_VER >= 1925
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
namespace filesys = std::filesystem;
|
namespace filesys = std::filesystem;
|
||||||
#else
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
namespace filesys = std::experimental::filesystem;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <streambuf>
|
#include <streambuf>
|
||||||
|
|
Loading…
Add table
Reference in a new issue