diff options
| -rw-r--r-- | dep/boost/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/Configuration/Config.cpp | 1 | ||||
| -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 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 5 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 1 |
7 files changed, 11 insertions, 9 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 2dae771c95a..aa7315f1e49 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -26,7 +26,7 @@ if (WIN32) # On windows the requirements are higher according to the wiki. set(BOOST_REQUIRED_VERSION 1.78) else() - set(BOOST_REQUIRED_VERSION 1.71) + set(BOOST_REQUIRED_VERSION 1.74) endif() find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem program_options iostreams regex locale) diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index e8d7ebea477..943d53a237c 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -18,6 +18,7 @@ #include "Config.h" #include "Log.h" #include "StringConvert.h" +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <boost/property_tree/ini_parser.hpp> #include <algorithm> 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" diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 25eb1a9f9e7..9e8b0dbb3b2 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -24,13 +24,14 @@ #include "adt.h" #include "wdt.h" -#include <boost/filesystem/path.hpp> +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> -#include <cstdio> +#include <boost/filesystem/path.hpp> #include <deque> #include <fstream> #include <set> #include <unordered_map> +#include <cstdio> #include <cstdlib> #include <cstring> diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 8809c94a0fc..462ae88d2ab 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -25,6 +25,7 @@ #include "wdtfile.h" #include "wmo.h" #include "mpq_libmpq04.h" +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <fstream> #include <iostream> |