diff options
| author | 2020-03-31 15:10:44 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:28 -0400 | |
| commit | 4caff51710a793c6c2c1069ddd6e92185aa731fe (patch) | |
| tree | 9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/core.cpp | |
| parent | common: alignment: Add a helper function for generic alignment checking. (diff) | |
| download | yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.gz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.xz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.zip | |
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.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 3bd90d79f..87b147f63 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -346,7 +346,7 @@ struct System::Impl { | |||
| 346 | std::unique_ptr<Loader::AppLoader> app_loader; | 346 | std::unique_ptr<Loader::AppLoader> app_loader; |
| 347 | std::unique_ptr<Tegra::GPU> gpu_core; | 347 | std::unique_ptr<Tegra::GPU> gpu_core; |
| 348 | std::unique_ptr<Hardware::InterruptManager> interrupt_manager; | 348 | std::unique_ptr<Hardware::InterruptManager> interrupt_manager; |
| 349 | Memory::Memory memory; | 349 | Core::Memory::Memory memory; |
| 350 | CpuManager cpu_manager; | 350 | CpuManager cpu_manager; |
| 351 | bool is_powered_on = false; | 351 | bool is_powered_on = false; |
| 352 | bool exit_lock = false; | 352 | bool exit_lock = false; |
| @@ -505,7 +505,7 @@ Memory::Memory& System::Memory() { | |||
| 505 | return impl->memory; | 505 | return impl->memory; |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | const Memory::Memory& System::Memory() const { | 508 | const Core::Memory::Memory& System::Memory() const { |
| 509 | return impl->memory; | 509 | return impl->memory; |
| 510 | } | 510 | } |
| 511 | 511 | ||