diff --git a/Source/UnitTests/Core/CoreTimingTest.cpp b/Source/UnitTests/Core/CoreTimingTest.cpp index 8857ef8aba..67a4f4c716 100644 --- a/Source/UnitTests/Core/CoreTimingTest.cpp +++ b/Source/UnitTests/Core/CoreTimingTest.cpp @@ -26,7 +26,7 @@ static u64 s_expected_callback = 0; static s64 s_lateness = 0; template -void CallbackTemplate(Core::System& system, u64 userdata, s64 lateness) +void CallbackTemplate(Core::System& system, const u64 userdata, const s64 lateness) { static_assert(IDX < CB_IDS.size(), "IDX out of range"); s_callbacks_ran_flags.set(IDX); @@ -73,8 +73,8 @@ private: std::string m_profile_path; }; -static void AdvanceAndCheck(Core::System& system, u32 idx, int downcount, int expected_lateness = 0, - int cpu_downcount = 0) +static void AdvanceAndCheck(Core::System& system, const u32 idx, const int downcount, + const int expected_lateness = 0, const int cpu_downcount = 0) { s_callbacks_ran_flags = 0; s_expected_callback = CB_IDS[idx]; @@ -132,7 +132,7 @@ namespace SharedSlotTest static unsigned int s_counter = 0; template -void FifoCallback(Core::System& system, u64 userdata, s64 lateness) +void FifoCallback(Core::System& system, const u64 userdata, const s64 lateness) { static_assert(ID < CB_IDS.size(), "ID out of range"); s_callbacks_ran_flags.set(ID); @@ -206,7 +206,7 @@ namespace ChainSchedulingTest { static int s_reschedules = 0; -static void RescheduleCallback(Core::System& system, u64 userdata, s64 lateness) +static void RescheduleCallback(Core::System& system, const u64 userdata, const s64 lateness) { --s_reschedules; EXPECT_TRUE(s_reschedules >= 0); @@ -269,7 +269,7 @@ namespace ScheduleIntoPastTest { static CoreTiming::EventType* s_cb_next = nullptr; -static void ChainCallback(Core::System& system, u64 userdata, s64 lateness) +static void ChainCallback(Core::System& system, const u64 userdata, const s64 lateness) { EXPECT_EQ(CB_IDS[0] + 1, userdata); EXPECT_EQ(0, lateness); diff --git a/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp b/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp index 1db600bb9a..52afa15fd2 100644 --- a/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp +++ b/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp @@ -251,7 +251,7 @@ TEST_F(FileSystemTest, RenameWithExistingTargetFile) TEST_F(FileSystemTest, GetDirectoryStats) { - auto check_stats = [this](u32 clusters, u32 inodes) { + auto check_stats = [this](const u32 clusters, const u32 inodes) { const Result stats = m_fs->GetDirectoryStats("/tmp"); ASSERT_TRUE(stats.Succeeded()); EXPECT_EQ(stats->used_clusters, clusters); @@ -308,7 +308,8 @@ TEST_F(FileSystemTest, Seek) EXPECT_EQ(file->GetStatus()->size, TEST_DATA.size()); EXPECT_EQ(file->GetStatus()->offset, TEST_DATA.size()); - auto seek_and_check = [&file](u32 offset, SeekMode mode, u32 expected_position) { + auto seek_and_check = [&file](const u32 offset, const SeekMode mode, + const u32 expected_position) { const Result new_offset = file->Seek(offset, mode); ASSERT_TRUE(new_offset.Succeeded()); EXPECT_EQ(*new_offset, expected_position); diff --git a/Source/UnitTests/Core/MMIOTest.cpp b/Source/UnitTests/Core/MMIOTest.cpp index a7c39c910a..457a579673 100644 --- a/Source/UnitTests/Core/MMIOTest.cpp +++ b/Source/UnitTests/Core/MMIOTest.cpp @@ -120,16 +120,17 @@ TEST_F(MappingTest, ReadWriteComplex) { bool read_called = false, write_called = false; - m_mapping->Register(0x0C001234, MMIO::ComplexRead([&read_called](Core::System&, u32 addr) { - EXPECT_EQ(0x0C001234u, addr); - read_called = true; - return 0x12; - }), - MMIO::ComplexWrite([&write_called](Core::System&, u32 addr, u8 val) { - EXPECT_EQ(0x0C001234u, addr); - EXPECT_EQ(0x34, val); - write_called = true; - })); + m_mapping->Register( + 0x0C001234, MMIO::ComplexRead([&read_called](Core::System&, const u32 addr) { + EXPECT_EQ(0x0C001234u, addr); + read_called = true; + return 0x12; + }), + MMIO::ComplexWrite([&write_called](Core::System&, const u32 addr, const u8 val) { + EXPECT_EQ(0x0C001234u, addr); + EXPECT_EQ(0x34, val); + write_called = true; + })); u8 val = m_mapping->Read(*m_system, 0x0C001234); EXPECT_EQ(0x12, val);