diff options
| author | 2022-02-01 02:29:36 -0500 | |
|---|---|---|
| committer | 2022-02-01 02:29:36 -0500 | |
| commit | 7432343214ae5c5b5e2937b601487d81d597c1a4 (patch) | |
| tree | 69a8e106636e984a1330fce5aa1a74421cbf4851 | |
| parent | Merge pull request #7824 from lioncash/scache (diff) | |
| parent | common/file: Remove [[nodiscard]] from Open() (diff) | |
| download | yuzu-7432343214ae5c5b5e2937b601487d81d597c1a4.tar.gz yuzu-7432343214ae5c5b5e2937b601487d81d597c1a4.tar.xz yuzu-7432343214ae5c5b5e2937b601487d81d597c1a4.zip | |
Merge pull request #7825 from lioncash/nodisc2
common/file: Remove [[nodiscard]] from Open()
Diffstat (limited to '')
| -rw-r--r-- | src/common/fs/file.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/fs/file.h b/src/common/fs/file.h index 2c4ab4332..a4f7944cd 100644 --- a/src/common/fs/file.h +++ b/src/common/fs/file.h | |||
| @@ -188,9 +188,8 @@ public: | |||
| 188 | 188 | ||
| 189 | #ifdef _WIN32 | 189 | #ifdef _WIN32 |
| 190 | template <typename Path> | 190 | template <typename Path> |
| 191 | [[nodiscard]] void Open(const Path& path, FileAccessMode mode, | 191 | void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile, |
| 192 | FileType type = FileType::BinaryFile, | 192 | FileShareFlag flag = FileShareFlag::ShareReadOnly) { |
| 193 | FileShareFlag flag = FileShareFlag::ShareReadOnly) { | ||
| 194 | using ValueType = typename Path::value_type; | 193 | using ValueType = typename Path::value_type; |
| 195 | if constexpr (IsChar<ValueType>) { | 194 | if constexpr (IsChar<ValueType>) { |
| 196 | Open(ToU8String(path), mode, type, flag); | 195 | Open(ToU8String(path), mode, type, flag); |