diff options
| author | JosJuice <josjuice@gmail.com> | 2019-06-20 10:39:56 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2019-06-20 10:39:56 +0200 |
| commit | fab15edb53583cdc2af4bcb01f491253ce2ce069 (patch) | |
| tree | cdde683a47f4d89d725e93fc14e643a6888db20f /Source/Core | |
| parent | 16afac9da9ef28f76d05b2ea8a373e8d461f81bc (diff) | |
Replace <experimental/filesystem> includes with <filesystem>
https://bugs.dolphin-emu.org/issues/11770
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/FileSearch.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/Boot/Boot.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 2994e00a74..561e1136e6 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -10,8 +10,8 @@ #ifdef _MSC_VER #include <Windows.h> -#include <experimental/filesystem> -namespace fs = std::experimental::filesystem; +#include <filesystem> +namespace fs = std::filesystem; #define HAS_STD_FILESYSTEM #else #include <cstring> diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 2a79213f3a..1f34b30ead 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -5,8 +5,8 @@ #include "Core/Boot/Boot.h" #ifdef _MSC_VER -#include <experimental/filesystem> -namespace fs = std::experimental::filesystem; +#include <filesystem> +namespace fs = std::filesystem; #define HAS_STD_FILESYSTEM #endif @@ -90,7 +90,7 @@ static std::vector<std::string> ReadM3UFile(const std::string& m3u_path, #ifdef HAS_STD_FILESYSTEM const fs::path path_line = fs::u8path(line); const std::string path_to_add = - path_line.is_relative() ? fs::u8path(folder_path).append(path_line).u8string() : line; + path_line.is_relative() ? (fs::u8path(folder_path) / path_line).u8string() : line; #else const std::string path_to_add = line.front() != '/' ? folder_path + line : line; #endif |