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.h | |
| 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.h')
| -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; | |||
| 36 | enum class ResultStatus : u16; | 36 | enum class ResultStatus : u16; |
| 37 | } // namespace Loader | 37 | } // namespace Loader |
| 38 | 38 | ||
| 39 | namespace Memory { | 39 | namespace Core::Memory { |
| 40 | struct CheatEntry; | 40 | struct CheatEntry; |
| 41 | } // namespace Memory | 41 | class Memory; |
| 42 | } // namespace Core::Memory | ||
| 42 | 43 | ||
| 43 | namespace Service { | 44 | namespace Service { |
| 44 | 45 | ||
| @@ -86,10 +87,6 @@ namespace Core::Hardware { | |||
| 86 | class InterruptManager; | 87 | class InterruptManager; |
| 87 | } | 88 | } |
| 88 | 89 | ||
| 89 | namespace Memory { | ||
| 90 | class Memory; | ||
| 91 | } | ||
| 92 | |||
| 93 | namespace Core { | 90 | namespace Core { |
| 94 | 91 | ||
| 95 | class ARM_Interface; | 92 | class ARM_Interface; |
| @@ -230,10 +227,10 @@ public: | |||
| 230 | const ExclusiveMonitor& Monitor() const; | 227 | const ExclusiveMonitor& Monitor() const; |
| 231 | 228 | ||
| 232 | /// Gets a mutable reference to the system memory instance. | 229 | /// Gets a mutable reference to the system memory instance. |
| 233 | Memory::Memory& Memory(); | 230 | Core::Memory::Memory& Memory(); |
| 234 | 231 | ||
| 235 | /// Gets a constant reference to the system memory instance. | 232 | /// Gets a constant reference to the system memory instance. |
| 236 | const Memory::Memory& Memory() const; | 233 | const Core::Memory::Memory& Memory() const; |
| 237 | 234 | ||
| 238 | /// Gets a mutable reference to the GPU interface | 235 | /// Gets a mutable reference to the GPU interface |
| 239 | Tegra::GPU& GPU(); | 236 | Tegra::GPU& GPU(); |