From 39b591bcfdc013b3d021d42549c47be2ab0a2dc2 Mon Sep 17 00:00:00 2001
From: Ryan Teal <rynteal93@gmail.com>
Date: Sun, 30 Jun 2019 16:00:17 +0100
Subject: [PATCH] Move namespaces to core::

---
 app/src/main/cpp/core/arm/cpu.cpp         | 2 +-
 app/src/main/cpp/core/arm/cpu.h           | 2 +-
 app/src/main/cpp/core/arm/memory.cpp      | 4 ++--
 app/src/main/cpp/core/arm/memory.h        | 2 +-
 app/src/main/cpp/core/hos/loaders/nro.cpp | 2 +-
 app/src/main/cpp/core/hos/loaders/nro.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/cpp/core/arm/cpu.cpp b/app/src/main/cpp/core/arm/cpu.cpp
index 231b20f5..fba51d03 100644
--- a/app/src/main/cpp/core/arm/cpu.cpp
+++ b/app/src/main/cpp/core/arm/cpu.cpp
@@ -1,5 +1,5 @@
 #include "cpu.h"
 
-namespace Core {
+namespace core {
 
 }
\ No newline at end of file
diff --git a/app/src/main/cpp/core/arm/cpu.h b/app/src/main/cpp/core/arm/cpu.h
index 8ce5f0ee..d57a6c69 100644
--- a/app/src/main/cpp/core/arm/cpu.h
+++ b/app/src/main/cpp/core/arm/cpu.h
@@ -2,7 +2,7 @@
 
 #include <unicorn/unicorn.h>
 
-namespace Core {
+namespace core {
     class Cpu {
     private:
         uc_engine *uc;
diff --git a/app/src/main/cpp/core/arm/memory.cpp b/app/src/main/cpp/core/arm/memory.cpp
index 5f6f8d12..2da5a448 100644
--- a/app/src/main/cpp/core/arm/memory.cpp
+++ b/app/src/main/cpp/core/arm/memory.cpp
@@ -3,9 +3,9 @@
 #include <vector>
 #include "memory.h"
 
-std::vector<mem::MemoryRegion> memRegions;
+namespace core::mem {
+    std::vector<MemoryRegion> memRegions;
 
-namespace mem {
     bool Map(uc_engine* uc, uint64_t address, size_t size, std::string label) {
         void* ptr = mmap((void*)(address), size, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0);
         if(!ptr)
diff --git a/app/src/main/cpp/core/arm/memory.h b/app/src/main/cpp/core/arm/memory.h
index 2d76cd15..48568e7d 100644
--- a/app/src/main/cpp/core/arm/memory.h
+++ b/app/src/main/cpp/core/arm/memory.h
@@ -4,7 +4,7 @@
 
 #define MEM_BASE 0x80000000
 
-namespace mem {
+namespace core::mem {
     struct MemoryRegion {
         std::string label;
         uint64_t address;
diff --git a/app/src/main/cpp/core/hos/loaders/nro.cpp b/app/src/main/cpp/core/hos/loaders/nro.cpp
index 07d24e97..1138b8f3 100644
--- a/app/src/main/cpp/core/hos/loaders/nro.cpp
+++ b/app/src/main/cpp/core/hos/loaders/nro.cpp
@@ -15,7 +15,7 @@ void ReadDataFromFile(std::string file, char* output, uint32_t offset, size_t si
     f.close();
 }
 
-namespace loader {
+namespace core::loader {
     bool LoadNro(std::string file) {
         syslog(LOG_INFO, "Loading NRO file %s\n", file.c_str());
 
diff --git a/app/src/main/cpp/core/hos/loaders/nro.h b/app/src/main/cpp/core/hos/loaders/nro.h
index 8e016da6..f0666c56 100644
--- a/app/src/main/cpp/core/hos/loaders/nro.h
+++ b/app/src/main/cpp/core/hos/loaders/nro.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-namespace loader {
+namespace core::loader {
     struct NroSegmentHeader {
         uint32_t fileOffset;
         uint32_t size;