diff --git a/Source/UnitTests/Common/BitFieldTest.cpp b/Source/UnitTests/Common/BitFieldTest.cpp index 24ef6bd90c..0b039ea1e3 100644 --- a/Source/UnitTests/Common/BitFieldTest.cpp +++ b/Source/UnitTests/Common/BitFieldTest.cpp @@ -494,7 +494,7 @@ union TestUnion5 TEST(BitFieldArray, StorageType) { TestUnion5 object; - const u64 arr2_hex_1 = 0b1010ull << 30; + constexpr u64 arr2_hex_1 = 0b1010ull << 30; object.hex = arr2_hex_1; const TestUnion5& objectc = object; @@ -509,17 +509,17 @@ TEST(BitFieldArray, StorageType) object.arr1[3] = 4; object.arr1[4] = 8; object.arr1[5] = 16; - const u64 arr1_hex = 0b10000'01000'00100'00010'00001'00000; + constexpr u64 arr1_hex = 0b10000'01000'00100'00010'00001'00000; EXPECT_EQ(object.hex, arr1_hex | arr2_hex_1); object.arr2[2] = object.arr2[0] = true; object.arr2[3] = object.arr2[1] = false; - const u64 arr2_hex_2 = 0b0101ull << 30; + constexpr u64 arr2_hex_2 = 0b0101ull << 30; EXPECT_EQ(object.hex, arr1_hex | arr2_hex_2); object.arr2[2] = object.arr2[1]; object.arr2[3] = objectc.arr2[0]; - const u64 arr2_hex_3 = 0b1001ull << 30; + constexpr u64 arr2_hex_3 = 0b1001ull << 30; EXPECT_EQ(object.hex, arr1_hex | arr2_hex_3); u32 counter = 0; diff --git a/Source/UnitTests/Common/Crypto/SHA1Test.cpp b/Source/UnitTests/Common/Crypto/SHA1Test.cpp index 463240ed84..5242e65412 100644 --- a/Source/UnitTests/Common/Crypto/SHA1Test.cpp +++ b/Source/UnitTests/Common/Crypto/SHA1Test.cpp @@ -9,7 +9,7 @@ TEST(SHA1, Vectors) { const char* msg; const Common::SHA1::Digest expected; - } const vectors[]{ + } constexpr vectors[]{ {"", {0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09}}, {"abc", {0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e, diff --git a/Source/UnitTests/Common/EventTest.cpp b/Source/UnitTests/Common/EventTest.cpp index f011059492..f04fe9f45a 100644 --- a/Source/UnitTests/Common/EventTest.cpp +++ b/Source/UnitTests/Common/EventTest.cpp @@ -12,7 +12,7 @@ TEST(Event, MultiThreaded) { Event has_sent, can_send; int shared_obj; - const int ITERATIONS_COUNT = 100000; + constexpr int ITERATIONS_COUNT = 100000; auto sender = [&]() { for (int i = 0; i < ITERATIONS_COUNT; ++i) diff --git a/Source/UnitTests/Common/FlagTest.cpp b/Source/UnitTests/Common/FlagTest.cpp index 2bda2f66b6..23aba5f60d 100644 --- a/Source/UnitTests/Common/FlagTest.cpp +++ b/Source/UnitTests/Common/FlagTest.cpp @@ -34,7 +34,7 @@ TEST(Flag, MultiThreaded) { Flag f; int count = 0; - const int ITERATIONS_COUNT = 100000; + constexpr int ITERATIONS_COUNT = 100000; auto setter = [&]() { for (int i = 0; i < ITERATIONS_COUNT; ++i) @@ -69,8 +69,8 @@ TEST(Flag, SpinLock) // Uses a flag to implement basic spinlocking using TestAndSet. Flag f; int count = 0; - const int ITERATIONS_COUNT = 5000; - const int THREADS_COUNT = 50; + constexpr int ITERATIONS_COUNT = 5000; + constexpr int THREADS_COUNT = 50; auto adder_func = [&]() { for (int i = 0; i < ITERATIONS_COUNT; ++i) diff --git a/Source/UnitTests/Core/IOS/ES/FormatsTest.cpp b/Source/UnitTests/Core/IOS/ES/FormatsTest.cpp index c2082ffbc8..56ad5beff1 100644 --- a/Source/UnitTests/Core/IOS/ES/FormatsTest.cpp +++ b/Source/UnitTests/Core/IOS/ES/FormatsTest.cpp @@ -14,11 +14,11 @@ TEST(ESFormats, TitleType) EXPECT_TRUE(IOS::ES::IsTitleType(Titles::SYSTEM_MENU, IOS::ES::TitleType::System)); EXPECT_FALSE(IOS::ES::IsDiscTitle(Titles::SYSTEM_MENU)); - const u64 ios59_title_id = 0x000000010000003b; + constexpr u64 ios59_title_id = 0x000000010000003b; EXPECT_TRUE(IOS::ES::IsTitleType(ios59_title_id, IOS::ES::TitleType::System)); EXPECT_FALSE(IOS::ES::IsDiscTitle(ios59_title_id)); - const u64 ztp_title_id = 0x00010000525a4445; + constexpr u64 ztp_title_id = 0x00010000525a4445; EXPECT_TRUE(IOS::ES::IsTitleType(ztp_title_id, IOS::ES::TitleType::Game)); EXPECT_TRUE(IOS::ES::IsDiscTitle(ztp_title_id)); } diff --git a/Source/UnitTests/Core/IOS/USB/SkylandersTest.cpp b/Source/UnitTests/Core/IOS/USB/SkylandersTest.cpp index e0b8eb7b98..bded202702 100644 --- a/Source/UnitTests/Core/IOS/USB/SkylandersTest.cpp +++ b/Source/UnitTests/Core/IOS/USB/SkylandersTest.cpp @@ -130,11 +130,11 @@ TEST(Skylanders, Keygen) std::array nuid; u8 sector; u64 expected; - } const inputs[]{{{0x00, 0x00, 0x00, 0x00}, 0, 0x4B0B20107CCB}, - {{0x94, 0xB0, 0xEE, 0x2D}, 0, 0x4B0B20107CCB}, - {{0x00, 0x00, 0x00, 0x00}, 11, 0xEA168579FF28}, - {{0x94, 0xB0, 0xEE, 0x2D}, 1, 0x278e4DA896B5}, - {{0xF7, 0xDB, 0xFD, 0x5F}, 2, 0x75B9B1F4B9EB}}; + } constexpr inputs[]{{{0x00, 0x00, 0x00, 0x00}, 0, 0x4B0B20107CCB}, + {{0x94, 0xB0, 0xEE, 0x2D}, 0, 0x4B0B20107CCB}, + {{0x00, 0x00, 0x00, 0x00}, 11, 0xEA168579FF28}, + {{0x94, 0xB0, 0xEE, 0x2D}, 1, 0x278e4DA896B5}, + {{0xF7, 0xDB, 0xFD, 0x5F}, 2, 0x75B9B1F4B9EB}}; for (auto& test : inputs) {