diff options
author | bunnei <bunneidev@gmail.com> | 2020-03-31 21:10:44 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2020-04-17 06:59:28 +0200 |
commit | 4caff51710a793c6c2c1069ddd6e92185aa731fe (patch) | |
tree | 9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/core.h | |
parent | common: alignment: Add a helper function for generic alignment checking. (diff) | |
download | yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.gz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.bz2 yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.lz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.xz yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.zst yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/core.h b/src/core/core.h index 8d862a8e6..c2bdef07e 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -36,9 +36,10 @@ class AppLoader; enum class ResultStatus : u16; } // namespace Loader -namespace Memory { +namespace Core::Memory { struct CheatEntry; -} // namespace Memory +class Memory; +} // namespace Core::Memory namespace Service { @@ -86,10 +87,6 @@ namespace Core::Hardware { class InterruptManager; } -namespace Memory { -class Memory; -} - namespace Core { class ARM_Interface; @@ -230,10 +227,10 @@ public: const ExclusiveMonitor& Monitor() const; /// Gets a mutable reference to the system memory instance. - Memory::Memory& Memory(); + Core::Memory::Memory& Memory(); /// Gets a constant reference to the system memory instance. - const Memory::Memory& Memory() const; + const Core::Memory::Memory& Memory() const; /// Gets a mutable reference to the GPU interface Tegra::GPU& GPU(); |