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:52:58 +0200 |
| commit | cfa838df5de5a36f6ecef5211e9a3ea8e3774d1b (patch) | |
| tree | eafa31791035808fbc30396ab34ec15123fa60e8 /src/tools | |
| parent | f4ef6f769b8c51d99bea040b95beb2eb0d6c8fd0 (diff) | |
Core/Misc: Support boost 1.85
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 cdcb9aff2c8..2cf375f7ad1 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 @@ -1401,7 +1402,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; @@ -1429,7 +1430,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 b4669cc9b06..5119ea676c3 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> @@ -127,7 +128,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; @@ -156,7 +157,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()); } |