diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-04-22 11:52:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-04-22 11:57:54 +0200 |
| commit | 7952661e2325ed726c903cb9d0a88f516d0a605e (patch) | |
| tree | 120552d55b488bc6d7a585d3b84bf3896393284f /src/server | |
| parent | 49f9e4666e1c92d6dfb9cd8a01f0f15fc226177a (diff) | |
Core/Misc: Support boost 1.85
(cherry picked from commit cfa838df5de5a36f6ecef5211e9a3ea8e3774d1b)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/database/Updater/UpdateFetcher.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptReloadMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_server.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp index b12f7633d0f..d3e024b15b4 100644 --- a/src/server/database/Updater/UpdateFetcher.cpp +++ b/src/server/database/Updater/UpdateFetcher.cpp @@ -16,13 +16,13 @@ */ #include "UpdateFetcher.h" -#include "Common.h" +#include "CryptoHash.h" #include "DBUpdater.h" #include "Field.h" -#include "CryptoHash.h" #include "Log.h" #include "QueryResult.h" #include "Util.h" +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <fstream> #include <sstream> diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 501540ae952..3a7e8326564 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -862,7 +862,7 @@ private: { boost::system::error_code code; - fs::copy_file(path, cache_path, fs::copy_option::fail_if_exists, code); + fs::copy_file(path, cache_path, code); if (code) { TC_LOG_FATAL("scripts.hotswap", ">> Failed to create cache entry for module " diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index fd92a87eda3..e32c156b081 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -43,12 +43,11 @@ EndScriptData */ #include "VMapManager2.h" #include "World.h" #include "WorldSession.h" - -#include <numeric> - +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <openssl/crypto.h> #include <openssl/opensslv.h> +#include <numeric> #if TRINITY_COMPILER == TRINITY_COMPILER_GNU #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |