From 1fc5eae5bd99e9a17e634f48e8291e6eed4202cc Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 26 Jun 2017 11:50:10 +0200 Subject: [PATCH] FileSearch: Add a static_assert for the preferred separator --- Source/Core/Common/FileSearch.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 0a8d0b369c..fd031a524c 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -113,9 +113,11 @@ std::vector DoFileSearch(const std::vector& directorie std::sort(result.begin(), result.end()); result.erase(std::unique(result.begin(), result.end()), result.end()); - // Dolphin expects to be able to use "/" (DIR_SEP) everywhere. std::filesystem uses the OS - // separator. - if (fs::path::preferred_separator != DIR_SEP_CHR) + // Dolphin expects to be able to use "/" (DIR_SEP) everywhere. + // std::filesystem uses the OS separator. + constexpr fs::path::value_type os_separator = fs::path::preferred_separator; + static_assert(os_separator == DIR_SEP_CHR || os_separator == '\\', "Unsupported path separator"); + if (os_separator != DIR_SEP_CHR) for (auto& path : result) std::replace(path.begin(), path.end(), '\\', DIR_SEP_CHR);