drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-23 20:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cpp20-concepts-file-open' into 'master'

Browse Source 
fix: constrain file.h Open templates with C++20 concepts

See merge request citron/rewrite!34
This commit is contained in:
Zephyron
2025-07-16 05:42:11 +00:00
parent 25e8c0539c 97490b0586
commit 2e5f8c8e8d
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/fs/file.h
View File

@@ -34,14 +34,23 @@ void OpenFileStream(FileStream& file_stream, const std::filesystem::path& path,
} }
#ifdef _WIN32 #ifdef _WIN32
template <typename FileStream, typename Path> #include <concepts>
void OpenFileStream(FileStream& file_stream, const Path& path, std::ios_base::openmode open_mode) {
if constexpr (IsChar<typename Path::value_type>) { // Concept to check if a type has a value_type member
file_stream.open(std::filesystem::path{ToU8String(path)}, open_mode); template <typename T>
} else { concept HasValueType = requires { typename T::value_type; };
file_stream.open(std::filesystem::path{path}, open_mode);
// Only enable this overload if Path has value_type
template <HasValueType Path>
void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile,
FileShareFlag flag = FileShareFlag::ShareReadOnly) {
using ValueType = typename Path::value_type;
if constexpr (IsChar<ValueType>) {
Open(ToU8String(path), mode, type, flag);
} else {
Open(std::filesystem::path{path}, mode, type, flag);
}
} }
}
#endif #endif
/** /**
@@ -184,7 +193,7 @@ public:
FileShareFlag flag = FileShareFlag::ShareReadOnly); FileShareFlag flag = FileShareFlag::ShareReadOnly);
#ifdef _WIN32 #ifdef _WIN32
template <typename Path> template <HasValueType Path>
void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile, void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile,
FileShareFlag flag = FileShareFlag::ShareReadOnly) { FileShareFlag flag = FileShareFlag::ShareReadOnly) {
using ValueType = typename Path::value_type; using ValueType = typename Path::value_type;