Moved basic types i16, u16, i32, u32, ... into vamiga namespace

dirkwhoffmann · Jan 9, 2025 · 5e3e5a3 · 5e3e5a3
1 parent 73bfcdb
commit 5e3e5a3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/Emulator/Base/Types.h b/Emulator/Base/Types.h
@@ -15,7 +15,7 @@
 // Type aliases
 //
 
-// namespace vamiga {
+namespace vamiga {
 
 typedef i64 Cycle;            // Master cycle units
 typedef i64 CPUCycle;         // CPU cycle units
@@ -37,4 +37,4 @@ typedef u8 KeyCode;
 // File Systems
 typedef u32 Block;
 
-// }
+}
diff --git a/Emulator/Components/CIA/TODTypes.h b/Emulator/Components/CIA/TODTypes.h
@@ -11,6 +11,7 @@
 
 #include "Types.h"
 
+namespace vamiga {
 //
 // Structures
 //
@@ -22,3 +23,5 @@ typedef struct
     u32 alarm;
 }
 TODInfo;
+
+}
diff --git a/Emulator/Misc/OSDebugger/OSDebugger.cpp b/Emulator/Misc/OSDebugger/OSDebugger.cpp
@@ -13,10 +13,10 @@
 #include "Memory.h"
 #include <sstream>
 
-using namespace os;
-
 namespace vamiga {
 
+using namespace os;
+
 string
 OSDebugger::dosTypeStr(u32 type)
 {

diff --git a/Emulator/Misc/OSDebugger/OSDebuggerTypes.h b/Emulator/Misc/OSDebugger/OSDebuggerTypes.h
@@ -13,7 +13,7 @@
 #include "Reflection.h"
 #include <vector>
 
-namespace os {
+namespace vamiga::os {
 
 #define APTR(x) (u32)(x)
 #define BPTR(x) (u32)(4*(x))

diff --git a/Emulator/Utilities/BasicTypes.h b/Emulator/Utilities/BasicTypes.h
@@ -46,7 +46,7 @@ namespace vamiga { namespace fs = std::filesystem; }
 // Integers
 //
 
-// namespace vamiga {
+namespace vamiga {
 
 // Signed integers
 typedef signed char        i8;
@@ -62,7 +62,7 @@ typedef unsigned int       u32;
 typedef unsigned long long u64;
 typedef unsigned long      usize;
 
-// }
+}
 
 //
 // Optionals

diff --git a/GUI/Metal/Layers/Canvas.swift b/GUI/Metal/Layers/Canvas.swift
@@ -235,7 +235,7 @@ class Canvas: Layer {
         precondition(sfTexture != nil)
 
         // Get the emulator texture
-        var buffer: UnsafePointer<u32>!
+        var buffer: UnsafePointer<UInt32>!
         var nr = 0
 
         // Prevent the stable texture from changing