summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-06-19 09:43:16 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-06-22 19:36:24 +0200
commit81b1b71993473b31321c8ff2d0dd0b267848a968 (patch)
tree3f2ab1041c7d819949fd68faa3dd21759f7ce2a9 /src/common
parentMerge pull request #6506 from ReinUsesLisp/master-semaphore-jthread (diff)
downloadyuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar.gz
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar.bz2
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar.lz
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar.xz
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.tar.zst
yuzu-81b1b71993473b31321c8ff2d0dd0b267848a968.zip
Diffstat (limited to '')
-rw-r--r--src/common/fs/fs.h16
-rw-r--r--src/common/logging/backend.cpp2
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>
*
* @returns True if file removal succeeds or file does not exist, false otherwise.
*/
-[[nodiscard]] bool RemoveFile(const std::filesystem::path& path);
+bool RemoveFile(const std::filesystem::path& path);
#ifdef _WIN32
template <typename Path>
-[[nodiscard]] bool RemoveFile(const Path& path) {
+bool RemoveFile(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) {
return RemoveFile(ToU8String(path));
} else {
@@ -251,11 +251,11 @@ template <typename Path>
*
* @returns True if directory removal succeeds or directory does not exist, false otherwise.
*/
-[[nodiscard]] bool RemoveDir(const std::filesystem::path& path);
+bool RemoveDir(const std::filesystem::path& path);
#ifdef _WIN32
template <typename Path>
-[[nodiscard]] bool RemoveDir(const Path& path) {
+bool RemoveDir(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) {
return RemoveDir(ToU8String(path));
} else {
@@ -276,11 +276,11 @@ template <typename Path>
*
* @returns True if the directory and all of its contents are removed successfully, false otherwise.
*/
-[[nodiscard]] bool RemoveDirRecursively(const std::filesystem::path& path);
+bool RemoveDirRecursively(const std::filesystem::path& path);
#ifdef _WIN32
template <typename Path>
-[[nodiscard]] bool RemoveDirRecursively(const Path& path) {
+bool RemoveDirRecursively(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) {
return RemoveDirRecursively(ToU8String(path));
} else {
@@ -301,11 +301,11 @@ template <typename Path>
*
* @returns True if all of the directory's contents are removed successfully, false otherwise.
*/
-[[nodiscard]] bool RemoveDirContentsRecursively(const std::filesystem::path& path);
+bool RemoveDirContentsRecursively(const std::filesystem::path& path);
#ifdef _WIN32
template <typename Path>
-[[nodiscard]] bool RemoveDirContentsRecursively(const Path& path) {
+bool RemoveDirContentsRecursively(const Path& path) {
if constexpr (IsChar<typename Path::value_type>) {
return RemoveDirContentsRecursively(ToU8String(path));
} 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) {
// Existence checks are done within the functions themselves.
// We don't particularly care if these succeed or not.
- void(FS::RemoveFile(old_filename));
+ FS::RemoveFile(old_filename);
void(FS::RenameFile(filename, old_filename));
file =