summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-27 12:16:40 -0400
committerGitHub <noreply@github.com>2023-03-27 12:16:40 -0400
commit0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch)
treee0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/core/core.h
parent3b30f5d8235a8b1118ffb9da932ffd3e6e15a3f6 (diff)
parent41d99aa89db7ee483112e49baa6c86e14adbd168 (diff)
Merge pull request #9984 from liamwhite/global-memory
memory: rename global memory references to application memory
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 7032240be..4a5aba032 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -256,10 +256,10 @@ public:
[[nodiscard]] const ExclusiveMonitor& Monitor() const;
/// Gets a mutable reference to the system memory instance.
- [[nodiscard]] Core::Memory::Memory& Memory();
+ [[nodiscard]] Core::Memory::Memory& ApplicationMemory();
/// Gets a constant reference to the system memory instance.
- [[nodiscard]] const Core::Memory::Memory& Memory() const;
+ [[nodiscard]] const Core::Memory::Memory& ApplicationMemory() const;
/// Gets a mutable reference to the GPU interface
[[nodiscard]] Tegra::GPU& GPU();