aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-03-31 15:10:44 -0400
committerbunnei <bunneidev@gmail.com>2020-04-17 00:59:28 -0400
commit4caff51710a793c6c2c1069ddd6e92185aa731fe (patch)
tree9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/core.cpp
parentb838e58d63c817aef365e023d2865033bcad0ac4 (diff)
core: memory: Move to Core::Memory namespace.
- helpful to disambiguate Kernel::Memory namespace.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 3bd90d79fd..87b147f630 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -346,7 +346,7 @@ struct System::Impl {
std::unique_ptr<Loader::AppLoader> app_loader;
std::unique_ptr<Tegra::GPU> gpu_core;
std::unique_ptr<Hardware::InterruptManager> interrupt_manager;
- Memory::Memory memory;
+ Core::Memory::Memory memory;
CpuManager cpu_manager;
bool is_powered_on = false;
bool exit_lock = false;
@@ -505,7 +505,7 @@ Memory::Memory& System::Memory() {
return impl->memory;
}
-const Memory::Memory& System::Memory() const {
+const Core::Memory::Memory& System::Memory() const {
return impl->memory;
}