diff options
| author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-11-25 12:32:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-25 18:32:09 +0100 |
| commit | 346dd4006ea1283136095d5c43f602324a095092 (patch) | |
| tree | edf04631782bbfcdb48eac79b79aebb11b40f479 /src/ARMJIT_A64/ARMJIT_Compiler.cpp | |
| parent | 651b0f680c4531558990a5beb0e638968009dc51 (diff) | |
Move all core types into namespaces (#1886)
* Reorganize namespaces
- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next
* Fix the build
Diffstat (limited to 'src/ARMJIT_A64/ARMJIT_Compiler.cpp')
| -rw-r--r-- | src/ARMJIT_A64/ARMJIT_Compiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ARMJIT_A64/ARMJIT_Compiler.cpp b/src/ARMJIT_A64/ARMJIT_Compiler.cpp index 90940b0..1b03758 100644 --- a/src/ARMJIT_A64/ARMJIT_Compiler.cpp +++ b/src/ARMJIT_A64/ARMJIT_Compiler.cpp @@ -39,7 +39,7 @@ using namespace Arm64Gen; extern "C" void ARM_Ret(); -namespace ARMJIT +namespace melonDS { /* @@ -106,7 +106,7 @@ void Compiler::A_Comp_MSR() if (CurInstr.Instr & (1 << 25)) { val = W0; - MOVI2R(val, ::ROR((CurInstr.Instr & 0xFF), ((CurInstr.Instr >> 7) & 0x1E))); + MOVI2R(val, melonDS::ROR((CurInstr.Instr & 0xFF), ((CurInstr.Instr >> 7) & 0x1E))); } else { |