diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-17 14:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 14:42:57 -0400 |
| commit | 57ca1e3e6942d1ef1b59c458e76ba969f0b739d5 (patch) | |
| tree | 1d7a026c695a73932030048329a2c0707656666e /src/tests/core/arm/arm_test_common.h | |
| parent | 41566c615b86183c4dbec5a6bc7596ed4d8a116b (diff) | |
| parent | 93da8e0abfcdcc6e3cb5488a0db12373429f1377 (diff) | |
Merge pull request #2252 from bunnei/move-page-table
core: Move PageTable struct into Common.
Diffstat (limited to 'src/tests/core/arm/arm_test_common.h')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/core/arm/arm_test_common.h b/src/tests/core/arm/arm_test_common.h index 0b7539601..d145dbfcc 100644 --- a/src/tests/core/arm/arm_test_common.h +++ b/src/tests/core/arm/arm_test_common.h @@ -9,10 +9,10 @@ #include <vector> #include "common/common_types.h" +#include "common/memory_hook.h" #include "core/hle/kernel/kernel.h" -#include "core/memory_hook.h" -namespace Memory { +namespace Common { struct PageTable; } @@ -58,7 +58,7 @@ public: private: friend struct TestMemory; - struct TestMemory final : Memory::MemoryHook { + struct TestMemory final : Common::MemoryHook { explicit TestMemory(TestEnvironment* env_) : env(env_) {} TestEnvironment* env; @@ -86,7 +86,7 @@ private: bool mutable_memory; std::shared_ptr<TestMemory> test_memory; std::vector<WriteRecord> write_records; - Memory::PageTable* page_table = nullptr; + Common::PageTable* page_table = nullptr; Kernel::KernelCore kernel; }; |
