mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 22:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge d5314cbf48 into 879a8889aa

Browse source
This commit is contained in:
Tygyh 2025-04-23 17:06:28 -05:00 • committed by GitHub
commit 01257fa87f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
View file

@ -32,7 +32,7 @@ protected:
m_fs = IOS::HLE::Kernel{}.GetFS(); m_fs = IOS::HLE::Kernel{}.GetFS();
} }
virtual ~FileSystemTest() ~FileSystemTest() override
{ {
if (UserDirectoryCreationFailed()) if (UserDirectoryCreationFailed())
{ {

4
Source/UnitTests/Core/MMIOTest.cpp
View file

@ -56,12 +56,12 @@ TEST(IsMMIOAddress, SpecialAddresses)
class MappingTest : public testing::Test class MappingTest : public testing::Test
{ {
protected: protected:
virtual void SetUp() override void SetUp() override
{ {
m_system = &Core::System::GetInstance(); m_system = &Core::System::GetInstance();
m_mapping = std::make_unique<MMIO::Mapping>(); m_mapping = std::make_unique<MMIO::Mapping>();
} }
virtual void TearDown() override void TearDown() override
{ {
m_system = nullptr; m_system = nullptr;
m_mapping.reset(); m_mapping.reset();

2
Source/UnitTests/Core/PageFaultTest.cpp
View file

@ -45,7 +45,7 @@ public:
std::size_t DisassembleNearCode(const JitBlock&, std::ostream&) const override { return 0; } std::size_t DisassembleNearCode(const JitBlock&, std::ostream&) const override { return 0; }
std::size_t DisassembleFarCode(const JitBlock&, std::ostream&) const override { return 0; } std::size_t DisassembleFarCode(const JitBlock&, std::ostream&) const override { return 0; }
const CommonAsmRoutinesBase* GetAsmRoutines() override { return nullptr; } const CommonAsmRoutinesBase* GetAsmRoutines() override { return nullptr; }
virtual bool HandleFault(uintptr_t access_address, SContext* ctx) override bool HandleFault(uintptr_t access_address, SContext* ctx) override
{ {
m_pre_unprotect_time = std::chrono::high_resolution_clock::now(); m_pre_unprotect_time = std::chrono::high_resolution_clock::now();
Common::UnWriteProtectMemory(m_data, PAGE_GRAN, /*allowExecute*/ false); Common::UnWriteProtectMemory(m_data, PAGE_GRAN, /*allowExecute*/ false);