diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-04-22 11:52:58 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-05-28 16:43:54 +0200 |
| commit | 78805e49c0b7bf52821aab9dfcf175d09f82b02e (patch) | |
| tree | c58442cfbcfdf4927491b0d972972e46de7b1c3a /src/tools | |
| parent | 3f6153f9d962d18ac6f794047709dc64dd830dd9 (diff) | |
Core/Misc: Support boost 1.85
(cherry picked from commit cfa838df5de5a36f6ecef5211e9a3ea8e3774d1b)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 9 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 5 |
2 files changed, 8 insertions, 6 deletions
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()); } |