From c0a6fa5dcc5a1335ee9eeb940bdfc6934ed01656 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 21 Jun 2019 18:07:59 +0200 Subject: Work around C++20 std::filesystem changes related to u8string --- Source/Core/Common/FileSearch.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/FileSearch.cpp') diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index b37e0cc5cd..6b28b93b4c 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -7,6 +7,7 @@ #include "Common/CommonPaths.h" #include "Common/FileSearch.h" +#include "Common/StringUtil.h" #ifdef _MSC_VER #include @@ -74,7 +75,7 @@ std::vector DoFileSearch(const std::vector& directorie std::vector native_exts; for (const auto& ext : exts) - native_exts.push_back(fs::u8path(ext)); + native_exts.push_back(StringToPath(ext)); // N.B. This avoids doing any copies auto ext_matches = [&native_exts](const fs::path& path) { @@ -93,11 +94,11 @@ std::vector DoFileSearch(const std::vector& directorie auto add_filtered = [&](const fs::directory_entry& entry) { auto& path = entry.path(); if (accept_all || (ext_matches(path) && !fs::is_directory(path))) - result.emplace_back(path.u8string()); + result.emplace_back(PathToString(path)); }; for (const auto& directory : directories) { - const fs::path directory_path = fs::u8path(directory); + const fs::path directory_path = StringToPath(directory); if (fs::is_directory(directory_path)) // Can't create iterators for non-existant directories { if (recursive) -- cgit v1.2.3