diff options
| author | 2014-04-17 21:19:32 -0400 | |
|---|---|---|
| committer | 2014-04-17 21:19:32 -0400 | |
| commit | fb026f6b46210d9e8cd24458c11c2d3845583a03 (patch) | |
| tree | f9e65485f62bd38cc84ff1778bde98689779ea79 | |
| parent | added memory read/write to GSP heap (diff) | |
| download | yuzu-fb026f6b46210d9e8cd24458c11c2d3845583a03.tar.gz yuzu-fb026f6b46210d9e8cd24458c11c2d3845583a03.tar.xz yuzu-fb026f6b46210d9e8cd24458c11c2d3845583a03.zip | |
moved enums into Memory:: namespace
Diffstat (limited to '')
| -rw-r--r-- | src/core/mem_map.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 9ca05cc4e..9931daece 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h | |||
| @@ -4,11 +4,11 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 8 | |||
| 9 | #include "common/common.h" | 7 | #include "common/common.h" |
| 10 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 11 | 9 | ||
| 10 | namespace Memory { | ||
| 11 | |||
| 12 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 13 | 13 | ||
| 14 | enum { | 14 | enum { |
| @@ -49,8 +49,6 @@ enum { | |||
| 49 | 49 | ||
| 50 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 50 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 51 | 51 | ||
| 52 | namespace Memory { | ||
| 53 | |||
| 54 | // Base is a pointer to the base of the memory map. Yes, some MMU tricks | 52 | // Base is a pointer to the base of the memory map. Yes, some MMU tricks |
| 55 | // are used to set up a full GC or Wii memory map in process memory. on | 53 | // are used to set up a full GC or Wii memory map in process memory. on |
| 56 | // 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that | 54 | // 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that |