From 48b18df668ad319819128ab62768fc39c9096a8e Mon Sep 17 00:00:00 2001 From: matteokeole Date: Tue, 18 Nov 2025 11:00:22 +0100 Subject: [PATCH 1/4] fix: Include and remove unused Linux includes --- scroll/base.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scroll/base.hpp b/scroll/base.hpp index 7112a60..51d6080 100644 --- a/scroll/base.hpp +++ b/scroll/base.hpp @@ -6,15 +6,11 @@ #include #include #include +#include #include #ifndef USER_NAMESPACE #define USER_NAMESPACE scroll #endif -#include "Base/Base/Base.hpp" - -#if OPERATING_SYSTEM == OPERATING_SYSTEM_LINUX - #include - #include -#endif \ No newline at end of file +#include "Base/Base/Base.hpp" \ No newline at end of file From cada7b4bfedd7d450cf1af703ebc4b9b3a10bf52 Mon Sep 17 00:00:00 2001 From: matteokeole Date: Tue, 18 Nov 2025 11:00:56 +0100 Subject: [PATCH 2/4] feat: Move base include in scroll.hpp --- scroll/ConsoleLogger/ConsoleLogger.hpp | 1 - scroll/FileLogger/FileLogger.hpp | 1 - scroll/Logger/Logger.hpp | 1 - scroll/scroll.hpp | 2 ++ 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scroll/ConsoleLogger/ConsoleLogger.hpp b/scroll/ConsoleLogger/ConsoleLogger.hpp index 2b6a356..bc97852 100644 --- a/scroll/ConsoleLogger/ConsoleLogger.hpp +++ b/scroll/ConsoleLogger/ConsoleLogger.hpp @@ -3,7 +3,6 @@ #pragma once -#include "base.hpp" #include "ConsoleEscapeCode.hpp" #include "Logger/Logger.hpp" #include "LogLevel.hpp" diff --git a/scroll/FileLogger/FileLogger.hpp b/scroll/FileLogger/FileLogger.hpp index 1aebbec..2236dfa 100644 --- a/scroll/FileLogger/FileLogger.hpp +++ b/scroll/FileLogger/FileLogger.hpp @@ -3,7 +3,6 @@ #pragma once -#include "base.hpp" #include "Logger/Logger.hpp" #include "LogLevel.hpp" diff --git a/scroll/Logger/Logger.hpp b/scroll/Logger/Logger.hpp index a9a97b2..854a2b9 100644 --- a/scroll/Logger/Logger.hpp +++ b/scroll/Logger/Logger.hpp @@ -3,7 +3,6 @@ #pragma once -#include "base.hpp" #include "LogLevel.hpp" namespace USER_NAMESPACE { diff --git a/scroll/scroll.hpp b/scroll/scroll.hpp index 12d0693..0b0f32a 100644 --- a/scroll/scroll.hpp +++ b/scroll/scroll.hpp @@ -3,6 +3,8 @@ #pragma once +#include "base.hpp" + #include "Conversions.hpp" #include "ConsoleLogger/ConsoleLogger.hpp" From 1234266d28e47d88dd9b79b80ce8658b3fbfdb12 Mon Sep 17 00:00:00 2001 From: matteokeole Date: Tue, 18 Nov 2025 11:01:19 +0100 Subject: [PATCH 3/4] fix: Don't check OS in macro undef --- scroll/LogLevel.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scroll/LogLevel.hpp b/scroll/LogLevel.hpp index 7e15717..976f84c 100644 --- a/scroll/LogLevel.hpp +++ b/scroll/LogLevel.hpp @@ -3,7 +3,7 @@ #pragma once -#if OPERATING_SYSTEM == OPERATING_SYSTEM_WINDOWS +#ifdef ERROR // NOTE: Avoid confict with macro defined in Windows.h. #undef ERROR #endif From 510f4c6f1125e19a1688bdd2a29bfb8381fca744 Mon Sep 17 00:00:00 2001 From: matteokeole Date: Tue, 18 Nov 2025 11:01:28 +0100 Subject: [PATCH 4/4] feat: Update base submodule --- Base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Base b/Base index 6ff3229..0c52431 160000 --- a/Base +++ b/Base @@ -1 +1 @@ -Subproject commit 6ff32298e858b35309eb1c6ae3b858f104b37b56 +Subproject commit 0c524315d1f0afc3850385b1150a40501c9c6363