From 346dd4006ea1283136095d5c43f602324a095092 Mon Sep 17 00:00:00 2001
From: Jesse Talavera-Greenberg <jesse@jesse.tg>
Date: Sat, 25 Nov 2023 12:32:09 -0500
Subject: 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
---
 src/debug/GdbArch.h    | 1 +
 src/debug/GdbCmds.cpp  | 1 +
 src/debug/GdbProto.cpp | 1 +
 src/debug/GdbProto.h   | 1 +
 src/debug/GdbStub.cpp  | 1 +
 src/debug/GdbStub.h    | 1 +
 src/debug/hexutil.h    | 3 +++
 7 files changed, 9 insertions(+)

(limited to 'src/debug')

diff --git a/src/debug/GdbArch.h b/src/debug/GdbArch.h
index 45f1c1b..1d45fb0 100644
--- a/src/debug/GdbArch.h
+++ b/src/debug/GdbArch.h
@@ -5,6 +5,7 @@
 namespace Gdb
 {
 
+using namespace melonDS;
 enum class Register : int
 {
 	r0,
diff --git a/src/debug/GdbCmds.cpp b/src/debug/GdbCmds.cpp
index 057502f..c470613 100644
--- a/src/debug/GdbCmds.cpp
+++ b/src/debug/GdbCmds.cpp
@@ -8,6 +8,7 @@
 
 #include "GdbProto.h"
 
+using namespace melonDS;
 using Platform::Log;
 using Platform::LogLevel;
 
diff --git a/src/debug/GdbProto.cpp b/src/debug/GdbProto.cpp
index dc80364..ebdf3be 100644
--- a/src/debug/GdbProto.cpp
+++ b/src/debug/GdbProto.cpp
@@ -24,6 +24,7 @@
 #include "GdbProto.h"
 
 
+using namespace melonDS;
 using Platform::Log;
 using Platform::LogLevel;
 
diff --git a/src/debug/GdbProto.h b/src/debug/GdbProto.h
index ef8bdec..68122f0 100644
--- a/src/debug/GdbProto.h
+++ b/src/debug/GdbProto.h
@@ -13,6 +13,7 @@
 
 namespace Gdb {
 
+using namespace melonDS;
 constexpr int GDBPROTO_BUFFER_CAPACITY = 1024+128;
 
 extern u8 Cmdbuf[GDBPROTO_BUFFER_CAPACITY];
diff --git a/src/debug/GdbStub.cpp b/src/debug/GdbStub.cpp
index d756ce4..099f27f 100644
--- a/src/debug/GdbStub.cpp
+++ b/src/debug/GdbStub.cpp
@@ -25,6 +25,7 @@
 #include "../Platform.h"
 #include "GdbProto.h"
 
+using namespace melonDS;
 using Platform::Log;
 using Platform::LogLevel;
 
diff --git a/src/debug/GdbStub.h b/src/debug/GdbStub.h
index b3bdab7..ace07bf 100644
--- a/src/debug/GdbStub.h
+++ b/src/debug/GdbStub.h
@@ -13,6 +13,7 @@
 namespace Gdb
 {
 
+using namespace melonDS;
 enum class TgtStatus
 {
 	NoEvent,
diff --git a/src/debug/hexutil.h b/src/debug/hexutil.h
index 9eb4ad2..63d1deb 100644
--- a/src/debug/hexutil.h
+++ b/src/debug/hexutil.h
@@ -9,6 +9,8 @@ extern "C"
 
 #include <stdint.h>
 
+namespace melonDS
+{
 inline static uint8_t hex2nyb(uint8_t v)
 {
 	if (v >= '0' && v <= '9') return v - '0';
@@ -71,5 +73,6 @@ inline static uint32_t unhex32(const uint8_t* src)
 }
 #endif
 
+}
 #endif
 
-- 
cgit v1.2.3