piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace <experimental/filesystem> includes with <filesystem>

Browse Source 
https://bugs.dolphin-emu.org/issues/11770
This commit is contained in:
JosJuice
2019-06-20 10:39:56 +02:00
parent 16afac9da9
commit fab15edb53
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/FileSearch.cpp
View File

@ -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>

6
Source/Core/Core/Boot/Boot.cpp
View File

@ -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