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/DataStores/DB2Stores.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Scripting/ScriptReloadMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_server.cpp | 1 | ||||
-rw-r--r-- | src/tools/map_extractor/System.cpp | 9 | ||||
-rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 5 |
8 files changed, 15 insertions, 10 deletions
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index 845f4ee8edc..4bf2c3feaa7 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 8af11fbf066..62404ec7cad 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 33a3eb4613b..9eb27231d18 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/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index fcfae9247ce..c04de82db12 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -28,6 +28,7 @@ #include "Timer.h" #include "Util.h" #include "World.h" +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <array> #include <bitset> diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 96125ffc113..17e9530818c 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -857,7 +857,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 ef8798be80d..6b607244805 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -41,6 +41,7 @@ EndScriptData */ #include "VMapManager2.h" #include "World.h" #include "WorldSession.h" +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <openssl/crypto.h> #include <openssl/opensslv.h> diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 0e6f224e166..1677b9d268f 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -30,14 +30,15 @@ #include "adt.h" #include "wdt.h" #include <CascLib.h> -#include <boost/filesystem/path.hpp> +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> +#include <boost/filesystem/path.hpp> #include <bitset> -#include <cstdio> #include <deque> #include <fstream> #include <set> #include <unordered_map> +#include <cstdio> #include <cstdlib> #include <cstring> #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS @@ -1395,7 +1396,7 @@ bool OpenCascStorage(int locale) return true; } - catch (boost::filesystem::filesystem_error const& error) + catch (std::exception const& error) { printf("Error opening CASC storage: %s\n", error.what()); return false; @@ -1423,7 +1424,7 @@ uint32 GetInstalledLocalesMask() return storage->GetInstalledLocalesMask(); } - catch (boost::filesystem::filesystem_error const& error) + catch (std::exception const& error) { printf("Unable to determine installed locales mask: %s\n", error.what()); } diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 1c29130769f..69bf428fc71 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -30,6 +30,7 @@ #include "wmo.h" #include <algorithm> #include <CascLib.h> +#include <boost/filesystem/directory.hpp> #include <boost/filesystem/operations.hpp> #include <fstream> #include <list> @@ -126,7 +127,7 @@ bool OpenCascStorage(int locale) return true; } - catch (boost::filesystem::filesystem_error const& error) + catch (std::exception const& error) { printf("error opening casc storage : %s\n", error.what()); return false; @@ -155,7 +156,7 @@ uint32 GetInstalledLocalesMask() return storage->GetInstalledLocalesMask(); } - catch (boost::filesystem::filesystem_error const& error) + catch (std::exception const& error) { printf("Unable to determine installed locales mask: %s\n", error.what()); } |