summaryrefslogtreecommitdiff
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorGravatar liamwhite2023-02-15 17:42:38 -0500
committerGravatar GitHub2023-02-15 17:42:38 -0500
commit04d2d2ef5fdd56baa0ecf60e59ea4e915262161d (patch)
tree3951ff8988fff573acd7f2b4edf5d95774b3721d /src/core/file_sys
parentMerge pull request #9809 from liamwhite/unused-service (diff)
parentremove constexpr from virtual function (diff)
downloadyuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.gz
yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.xz
yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.zip
Merge pull request #9782 from arades79/fix-consexpr-value-declaration-usage
Fix consexpr value declaration usage
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/ips_layer.cpp8
-rw-r--r--src/core/file_sys/registered_cache.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp
index 5aab428bb..efdf18cee 100644
--- a/src/core/file_sys/ips_layer.cpp
+++ b/src/core/file_sys/ips_layer.cpp
@@ -41,12 +41,12 @@ static IPSFileType IdentifyMagic(const std::vector<u8>& magic) {
41 return IPSFileType::Error; 41 return IPSFileType::Error;
42 } 42 }
43 43
44 constexpr std::array<u8, 5> patch_magic{{'P', 'A', 'T', 'C', 'H'}}; 44 static constexpr std::array<u8, 5> patch_magic{{'P', 'A', 'T', 'C', 'H'}};
45 if (std::equal(magic.begin(), magic.end(), patch_magic.begin())) { 45 if (std::equal(magic.begin(), magic.end(), patch_magic.begin())) {
46 return IPSFileType::IPS; 46 return IPSFileType::IPS;
47 } 47 }
48 48
49 constexpr std::array<u8, 5> ips32_magic{{'I', 'P', 'S', '3', '2'}}; 49 static constexpr std::array<u8, 5> ips32_magic{{'I', 'P', 'S', '3', '2'}};
50 if (std::equal(magic.begin(), magic.end(), ips32_magic.begin())) { 50 if (std::equal(magic.begin(), magic.end(), ips32_magic.begin())) {
51 return IPSFileType::IPS32; 51 return IPSFileType::IPS32;
52 } 52 }
@@ -55,12 +55,12 @@ static IPSFileType IdentifyMagic(const std::vector<u8>& magic) {
55} 55}
56 56
57static bool IsEOF(IPSFileType type, const std::vector<u8>& data) { 57static bool IsEOF(IPSFileType type, const std::vector<u8>& data) {
58 constexpr std::array<u8, 3> eof{{'E', 'O', 'F'}}; 58 static constexpr std::array<u8, 3> eof{{'E', 'O', 'F'}};
59 if (type == IPSFileType::IPS && std::equal(data.begin(), data.end(), eof.begin())) { 59 if (type == IPSFileType::IPS && std::equal(data.begin(), data.end(), eof.begin())) {
60 return true; 60 return true;
61 } 61 }
62 62
63 constexpr std::array<u8, 4> eeof{{'E', 'E', 'O', 'F'}}; 63 static constexpr std::array<u8, 4> eeof{{'E', 'E', 'O', 'F'}};
64 return type == IPSFileType::IPS32 && std::equal(data.begin(), data.end(), eeof.begin()); 64 return type == IPSFileType::IPS32 && std::equal(data.begin(), data.end(), eeof.begin());
65} 65}
66 66
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp
index 878d832c2..a6960170c 100644
--- a/src/core/file_sys/registered_cache.cpp
+++ b/src/core/file_sys/registered_cache.cpp
@@ -71,7 +71,7 @@ static std::string GetRelativePathFromNcaID(const std::array<u8, 16>& nca_id, bo
71} 71}
72 72
73static std::string GetCNMTName(TitleType type, u64 title_id) { 73static std::string GetCNMTName(TitleType type, u64 title_id) {
74 constexpr std::array<const char*, 9> TITLE_TYPE_NAMES{ 74 static constexpr std::array<const char*, 9> TITLE_TYPE_NAMES{
75 "SystemProgram", 75 "SystemProgram",
76 "SystemData", 76 "SystemData",
77 "SystemUpdate", 77 "SystemUpdate",