diff options
| -rw-r--r-- | src/core/guest_memory.h | 7 | ||||
| -rw-r--r-- | src/core/memory.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/guest_memory.h b/src/core/guest_memory.h index 8030df73a..7ee18c126 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::Memory diff --git a/src/core/memory.h b/src/core/memory.h index 552fd585f..f7e6b297f 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 |