VERY experimental Nintendo Switch 2 emulator
C++
Core: Invert guest memory depandancy
Fernando Sahmkowa70f35d0bf90
diff --git a/src/core/guest_memory.h b/src/core/guest_memory.hindex 8030df73a5..7ee18c1269 100644--- a/src/core/guest_memory.h+++ b/src/core/guest_memory.h@@ -9,8 +9,8 @@#include <span>#include <vector>+#include "common/assert.h"#include "common/scratch_buffer.h"-#include "core/memory.h"namespace Core::Memory {@@ -211,9 +211,4 @@ public:};} // namespace-template <typename T, GuestMemoryFlags FLAGS>-using CpuGuestMemory = GuestMemory<Core::Memory::Memory, T, FLAGS>;-template <typename T, GuestMemoryFlags FLAGS>-using CpuGuestMemoryScoped = GuestMemoryScoped<Core::Memory::Memory, T, FLAGS>;-} // namespace Core::Memorydiff --git a/src/core/memory.h b/src/core/memory.hindex 552fd585f3..f7e6b297f6 100644--- a/src/core/memory.h+++ b/src/core/memory.h@@ -12,6 +12,7 @@#include "common/scratch_buffer.h"#include "common/typed_address.h"+#include "core/guest_memory.h"#include "core/hle/result.h"namespace Common {@@ -498,4 +499,9 @@ private:std::unique_ptr<Impl> impl;};+template <typename T, GuestMemoryFlags FLAGS>+using CpuGuestMemory = GuestMemory<Core::Memory::Memory, T, FLAGS>;+template <typename T, GuestMemoryFlags FLAGS>+using CpuGuestMemoryScoped = GuestMemoryScoped<Core::Memory::Memory, T, FLAGS>;+} // namespace Core::Memory