From eb0f0f06dd44c7c1d89e287a4ec19c152eef8580 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sat, 26 Jan 2019 23:17:42 +1100 Subject: [PATCH] fix fs::path::preferred_separator not working with string concat on msvc --- deps/datReader/GameData.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/datReader/GameData.cpp b/deps/datReader/GameData.cpp index 9b404820..4b4a71e4 100644 --- a/deps/datReader/GameData.cpp +++ b/deps/datReader/GameData.cpp @@ -58,7 +58,12 @@ GameData::GameData(const std::experimental::filesystem::path& path) try : { int maxExLevel = 0; - auto sep = std::experimental::filesystem::path::preferred_separator; + // msvc has retarded stdlib implementation +#ifdef _WIN32 + static constexpr auto sep = "\\"; +#else + static constexpr auto sep = std::experimental::filesystem::path::preferred_separator; +#endif // Determine which expansions are available while( std::experimental::filesystem::exists( std::experimental::filesystem::path( m_path.string() + sep + "ex" + std::to_string( maxExLevel + 1 ) + sep + "ex" + std::to_string( maxExLevel + 1 ) + ".ver" ) ) )