Replace define private with __friends

include/PSX/File/Processor/file_processor.hpp

@@ -5,7 +5,7 @@
 namespace JabyEngine {
     namespace FileProcessor {
         class State {
-        private:
+        __friends:
             struct Reserved {
                 uint32_t reserved[4];     
             };
@@ -33,7 +33,7 @@ namespace JabyEngine {
                 }
             };
 
-        private:
+        __friends:
             Configuration config;
             Reserved      reserved;
 

include/PSX/Timer/frame_timer.hpp

@@ -5,7 +5,7 @@
 
 namespace JabyEngine {
     class MasterTime {
-    private:
+    __friends:
         static uint32_t value;
 
     public:

include/PSX/Timer/high_res_timer.hpp

@@ -54,7 +54,7 @@ namespace JabyEngine {
         friend class HighResTime;
         };
 
-    private:
+    __friends:
         static constexpr uint16_t TicksFor100us = CPUTicks::ticks_per_us<uint16_t>(CPUTicks::Frequency_Hz_Div8, 100.0);
         static constexpr uint16_t TicksFor1ms   = CPUTicks::ticks_per_ms<uint16_t>(CPUTicks::Frequency_Hz_Div8, 1.0);
         static constexpr uint16_t TicksFor10ms  = CPUTicks::ticks_per_ms<uint16_t>(CPUTicks::Frequency_Hz_Div8, 10.0);

include/PSX/jabyengine_defines.h

@@ -10,6 +10,10 @@
 #define __section(name) __attribute__((section(name)))
 #define __collect(...) __VA_ARGS__
 
+#ifndef __friends
+    #define __friends private
+#endif //!__friends
+
 #ifdef __cplusplus
     #define __constexpr constexpr
     #define START_C_FUNCTIONS extern "C" {

src/Library/Library.code-workspace

@@ -62,7 +62,8 @@
         "C_Cpp.default.compilerArgs": [
             ],
 		"C_Cpp.default.defines": [
-			"JABYENGINE_PAL"
+			"JABYENGINE_PAL",
+			"__friends=public"
             ],
 		"files.exclude": {
 			"**/*.o": true,

src/Library/Makefile

@@ -7,7 +7,7 @@ BUILD_DIR = bin
 SPLASH_IMAGE      = src/BootLoader/splash_image_pal_boot.hpp
 SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp
 
-CCFLAGS += -Iinclude -I../../include
+CCFLAGS += -Iinclude -I../../include -D__friends=public
 CCFLAGS += -save-temps=obj
 
 include ../../lib/Wildcard.mk

src/Library/src/BootLoader/timer_boot.cpp

@@ -1,8 +1,6 @@
 #include <PSX/System/IOPorts/interrupt_io.hpp>
 #include <PSX/System/syscalls.hpp>
-#define private public
 #include <PSX/Timer/high_res_timer.hpp>
-#undef private
 
 namespace JabyEngine {
     namespace Timer {

src/Library/src/File/Processor/simplehelper.hpp

@@ -1,8 +1,6 @@
 #ifndef __JABYENGINE_INTERNAL_SIMPLE_HELPER_HPP__
 #define __JABYENGINE_INTERNAL_SIMPLE_HELPER_HPP__
 
-// Instead of using friend we use this to access the private members
-#define private public
 #include <PSX/File/Processor/file_processor.hpp>
 
 namespace JabyEngine {

src/Library/src/GPU/gpu.cpp

@@ -1,8 +1,5 @@
 #include "../../internal-include/GPU/gpu_internal.hpp"
-// We need to access the master time
-#define private public
 #include <PSX/Timer/frame_timer.hpp>
-#undef private
 #include <PSX/System/IOPorts/interrupt_io.hpp>
 #include <PSX/System/syscalls.hpp>
 

src/Library/src/Timer/high_res_timer.cpp

@@ -1,8 +1,6 @@
-#define private public
 #include <PSX/System/IOPorts/timer_io.hpp>
 #include <PSX/System/syscalls.hpp>
 #include <PSX/Timer/high_res_timer.hpp>
-#undef private
 
 namespace JabyEngine {
     volatile uint16_t HighResTime :: global_counter_10ms = 0;