From 7ba21a6dda271a637dac7d3ce6e892f0303030e1 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Fri, 28 Jul 2023 19:21:27 +0300 Subject: [PATCH] Fix GCC build --- include/logger.hpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/logger.hpp b/include/logger.hpp index 92555269..9dbc4512 100644 --- a/include/logger.hpp +++ b/include/logger.hpp @@ -2,14 +2,12 @@ #include #include -#include "compiler_builtins.hpp" - namespace Log { // Our logger class template class Logger { public: - ALWAYS_INLINE void log(const char* fmt, ...) { + void log(const char* fmt, ...) { if constexpr (!enabled) return; std::va_list args; @@ -63,17 +61,17 @@ namespace Log { // We need this because sadly due to the loggers taking variadic arguments, compilers will not properly // Kill them fully even when they're disabled. The only way they will is if the function with varargs is totally empty -#define MAKE_LOG_FUNCTION_USER(functionName, logger) \ - template \ - ALWAYS_INLINE void functionName(const char* fmt, Args&&... args) { \ - Log::logger.log(fmt, args...); \ +#define MAKE_LOG_FUNCTION_USER(functionName, logger) \ + template \ + void functionName(const char* fmt, Args&&... args) { \ + Log::logger.log(fmt, args...); \ } #ifdef PANDA3DS_USER_BUILD #define MAKE_LOG_FUNCTION(functionName, logger) \ template \ - ALWAYS_INLINE void functionName(const char* fmt, Args&&... args) {} + void functionName(const char* fmt, Args&&... args) {} #else #define MAKE_LOG_FUNCTION(functionName, logger) MAKE_LOG_FUNCTION_USER(functionName, logger) #endif -} \ No newline at end of file +}