summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/common/Logging.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/common/Logging.h b/lib/common/Logging.h
index 3a7b18b7..04aed1cf 100644
--- a/lib/common/Logging.h
+++ b/lib/common/Logging.h
@@ -42,10 +42,21 @@
#define BOX_TRACE(stuff) BOX_LOG(Log::TRACE, stuff)
#endif
+#undef ERROR
+
namespace Log
{
- enum Level { NOTHING = 1, FATAL, ERROR, WARNING, NOTICE, INFO, TRACE,
- EVERYTHING };
+ enum Level
+ {
+ NOTHING = 1,
+ FATAL,
+ ERROR,
+ WARNING,
+ NOTICE,
+ INFO,
+ TRACE,
+ EVERYTHING
+ };
}
// --------------------------------------------------------------------------