Browse Source

name collision fix

Kajetan Johannes Hammerle 2 years ago
parent
commit
a683bc6543
2 changed files with 6 additions and 6 deletions
  1. 1 1
      utils/Logger.cpp
  2. 5 5
      utils/Logger.h

+ 1 - 1
utils/Logger.cpp

@@ -1,3 +1,3 @@
 #include "utils/Logger.h"
 
-Logger::Level Logger::level = Logger::DEBUG;
+Logger::Level Logger::level = Logger::L_DEBUG;

+ 5 - 5
utils/Logger.h

@@ -4,13 +4,13 @@
 #include <iostream>
 
 namespace Logger {
-    enum Level { NONE, ERROR, WARNING, INFO, DEBUG };
+    enum Level { L_NONE, L_ERROR, L_WARNING, L_INFO, L_DEBUG };
     extern Level level;
 }
 
 #if LOG_LEVEL >= 1
 #define LOG_ERROR(text)                                                        \
-    if(Logger::level >= Logger::Level::ERROR) {                                \
+    if(Logger::level >= Logger::Level::L_ERROR) {                              \
         std::cout << "\33[1;31m[ERROR] " << (text) << "\33[39;49m\n";          \
     }
 #else
@@ -19,7 +19,7 @@ namespace Logger {
 
 #if LOG_LEVEL >= 2
 #define LOG_WARNING(text)                                                      \
-    if(Logger::level >= Logger::Level::WARNING) {                              \
+    if(Logger::level >= Logger::Level::L_WARNING) {                            \
         std::cout << "\33[1;33m[WARNING] " << (text) << "\33[39;49m\n";        \
     }
 #else
@@ -28,7 +28,7 @@ namespace Logger {
 
 #if LOG_LEVEL >= 3
 #define LOG_INFO(text)                                                         \
-    if(Logger::level >= Logger::Level::INFO) {                                 \
+    if(Logger::level >= Logger::Level::L_INFO) {                               \
         std::cout << "\33[1;37m[INFO] " << (text) << "\33[39;49m\n";           \
     }
 #else
@@ -37,7 +37,7 @@ namespace Logger {
 
 #if LOG_LEVEL >= 4
 #define LOG_DEBUG(text)                                                        \
-    if(Logger::level >= Logger::Level::DEBUG) {                                \
+    if(Logger::level >= Logger::Level::L_DEBUG) {                              \
         std::cout << "\33[1;32m[DEBUG] " << (text) << "\33[39;49m\n";          \
     }
 #else