diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/fs/fs.h | 16 | ||||
| -rw-r--r-- | src/common/logging/backend.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/common/fs/fs.h b/src/common/fs/fs.h index f6f256349..cf7dfffcc 100644 --- a/src/common/fs/fs.h +++ b/src/common/fs/fs.h | |||
| @@ -55,11 +55,11 @@ template <typename Path> | |||
| 55 | * | 55 | * |
| 56 | * @returns True if file removal succeeds or file does not exist, false otherwise. | 56 | * @returns True if file removal succeeds or file does not exist, false otherwise. |
| 57 | */ | 57 | */ |
| 58 | [[nodiscard]] bool RemoveFile(const std::filesystem::path& path); | 58 | bool RemoveFile(const std::filesystem::path& path); |
| 59 | 59 | ||
| 60 | #ifdef _WIN32 | 60 | #ifdef _WIN32 |
| 61 | template <typename Path> | 61 | template <typename Path> |
| 62 | [[nodiscard]] bool RemoveFile(const Path& path) { | 62 | bool RemoveFile(const Path& path) { |
| 63 | if constexpr (IsChar<typename Path::value_type>) { | 63 | if constexpr (IsChar<typename Path::value_type>) { |
| 64 | return RemoveFile(ToU8String(path)); | 64 | return RemoveFile(ToU8String(path)); |
| 65 | } else { | 65 | } else { |
| @@ -251,11 +251,11 @@ template <typename Path> | |||
| 251 | * | 251 | * |
| 252 | * @returns True if directory removal succeeds or directory does not exist, false otherwise. | 252 | * @returns True if directory removal succeeds or directory does not exist, false otherwise. |
| 253 | */ | 253 | */ |
| 254 | [[nodiscard]] bool RemoveDir(const std::filesystem::path& path); | 254 | bool RemoveDir(const std::filesystem::path& path); |
| 255 | 255 | ||
| 256 | #ifdef _WIN32 | 256 | #ifdef _WIN32 |
| 257 | template <typename Path> | 257 | template <typename Path> |
| 258 | [[nodiscard]] bool RemoveDir(const Path& path) { | 258 | bool RemoveDir(const Path& path) { |
| 259 | if constexpr (IsChar<typename Path::value_type>) { | 259 | if constexpr (IsChar<typename Path::value_type>) { |
| 260 | return RemoveDir(ToU8String(path)); | 260 | return RemoveDir(ToU8String(path)); |
| 261 | } else { | 261 | } else { |
| @@ -276,11 +276,11 @@ template <typename Path> | |||
| 276 | * | 276 | * |
| 277 | * @returns True if the directory and all of its contents are removed successfully, false otherwise. | 277 | * @returns True if the directory and all of its contents are removed successfully, false otherwise. |
| 278 | */ | 278 | */ |
| 279 | [[nodiscard]] bool RemoveDirRecursively(const std::filesystem::path& path); | 279 | bool RemoveDirRecursively(const std::filesystem::path& path); |
| 280 | 280 | ||
| 281 | #ifdef _WIN32 | 281 | #ifdef _WIN32 |
| 282 | template <typename Path> | 282 | template <typename Path> |
| 283 | [[nodiscard]] bool RemoveDirRecursively(const Path& path) { | 283 | bool RemoveDirRecursively(const Path& path) { |
| 284 | if constexpr (IsChar<typename Path::value_type>) { | 284 | if constexpr (IsChar<typename Path::value_type>) { |
| 285 | return RemoveDirRecursively(ToU8String(path)); | 285 | return RemoveDirRecursively(ToU8String(path)); |
| 286 | } else { | 286 | } else { |
| @@ -301,11 +301,11 @@ template <typename Path> | |||
| 301 | * | 301 | * |
| 302 | * @returns True if all of the directory's contents are removed successfully, false otherwise. | 302 | * @returns True if all of the directory's contents are removed successfully, false otherwise. |
| 303 | */ | 303 | */ |
| 304 | [[nodiscard]] bool RemoveDirContentsRecursively(const std::filesystem::path& path); | 304 | bool RemoveDirContentsRecursively(const std::filesystem::path& path); |
| 305 | 305 | ||
| 306 | #ifdef _WIN32 | 306 | #ifdef _WIN32 |
| 307 | template <typename Path> | 307 | template <typename Path> |
| 308 | [[nodiscard]] bool RemoveDirContentsRecursively(const Path& path) { | 308 | bool RemoveDirContentsRecursively(const Path& path) { |
| 309 | if constexpr (IsChar<typename Path::value_type>) { | 309 | if constexpr (IsChar<typename Path::value_type>) { |
| 310 | return RemoveDirContentsRecursively(ToU8String(path)); | 310 | return RemoveDirContentsRecursively(ToU8String(path)); |
| 311 | } else { | 311 | } else { |
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index d5cff400f..47dba48ca 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -159,7 +159,7 @@ FileBackend::FileBackend(const std::filesystem::path& filename) { | |||
| 159 | 159 | ||
| 160 | // Existence checks are done within the functions themselves. | 160 | // Existence checks are done within the functions themselves. |
| 161 | // We don't particularly care if these succeed or not. | 161 | // We don't particularly care if these succeed or not. |
| 162 | void(FS::RemoveFile(old_filename)); | 162 | FS::RemoveFile(old_filename); |
| 163 | void(FS::RenameFile(filename, old_filename)); | 163 | void(FS::RenameFile(filename, old_filename)); |
| 164 | 164 | ||
| 165 | file = | 165 | file = |