From 734ee0f6352fdb6077c142d90f191c11c32f98d2 Mon Sep 17 00:00:00 2001 From: Steph Enders Date: Sun, 26 Jun 2022 21:57:43 -0400 Subject: Alias filesystem library to allow for xp usage MacOS 10.14 still uses experimental/filesystem which is what we're currently targetting. If I can get my hands on a 10.15+ we can test that out --- src/resources/macos/MacResources.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/resources/macos/MacResources.h') diff --git a/src/resources/macos/MacResources.h b/src/resources/macos/MacResources.h index 7af24b6..1d19575 100644 --- a/src/resources/macos/MacResources.h +++ b/src/resources/macos/MacResources.h @@ -28,20 +28,22 @@ #ifndef DNG_MACRESOURCES_H #define DNG_MACRESOURCES_H #include "../Resources.h" -namespace std::filesystem = std::experimental::filesystem; + +namespace fs = std::experimental::filesystem; + class MacResources : public Resources { public: MacResources(); protected: public: - const char *convert_to_str(std::filesystem::path &path) override; + const char *convert_to_str(fs::path &path) override; protected: - std::filesystem::path exeDir; - std::filesystem::path workingDir; - std::vector levelSearchDirs() override; - std::vector defaultsSearchDirs() override; - std::vector fontSearchDirs() override; + fs::path exeDir; + fs::path workingDir; + std::vector levelSearchDirs() override; + std::vector defaultsSearchDirs() override; + std::vector fontSearchDirs() override; }; #endif // DNG_MACRESOURCES_H -- cgit v1.2.3-54-g00ecf