Replace define private with __friends

This commit is contained in:
Björn Gaier
2023-10-06 14:50:44 +02:00
parent 46fc185be5
commit c78f103ca7
10 changed files with 11 additions and 15 deletions

View File

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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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>

View File

@@ -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;