From 181e0dba21b78a23df9a459fc01b870ccf0466e9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 21 Aug 2020 18:04:50 -0700 Subject: [PATCH] apply `if constexpr` in a couple places --- Source/Core/Common/FileSearch.cpp | 4 +++- Source/Core/Common/SDCardUtil.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index ff2de8eb3b..bbcdc12026 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -125,9 +125,11 @@ std::vector DoFileSearch(const std::vector& directorie // std::filesystem uses the OS separator. constexpr fs::path::value_type os_separator = fs::path::preferred_separator; static_assert(os_separator == DIR_SEP_CHR || os_separator == '\\', "Unsupported path separator"); - if (os_separator != DIR_SEP_CHR) + if constexpr (os_separator != DIR_SEP_CHR) + { for (auto& path : result) std::replace(path.begin(), path.end(), '\\', DIR_SEP_CHR); + } return result; } diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 22284a008f..16f855f6ea 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -247,7 +247,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename) if (!write_sector(file, s_fsinfo_sector)) goto FailWrite; - if (BACKUP_BOOT_SECTOR > 0) + if constexpr (BACKUP_BOOT_SECTOR > 0) { if (!write_empty(file, BACKUP_BOOT_SECTOR - 2)) goto FailWrite;