X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcpp-common%2Fbt2%2Flogging.hpp;h=d8c8a480b5751c18dd8035d090e51cb7a068d596;hb=1c5ea5eb3a9adbc3adc4a3a36a6cf09f7fa05bf1;hp=10e1ee3a9fe83c9b222fb87c20eaeb35e84563fe;hpb=eee15e593cc1c99b61d5d7089aea2f47e820b461;p=babeltrace.git

diff --git a/src/cpp-common/bt2/logging.hpp b/src/cpp-common/bt2/logging.hpp
index 10e1ee3a..d8c8a480 100644
--- a/src/cpp-common/bt2/logging.hpp
+++ b/src/cpp-common/bt2/logging.hpp
@@ -9,19 +9,27 @@
 
 #include <babeltrace2/babeltrace.h>
 
+#include "common/macros.h"
+
 namespace bt2 {
 
+/* Avoid `-Wshadow` error on GCC, conflicting with `bt2::Error` */
+BT_DIAG_PUSH
+BT_DIAG_IGNORE_SHADOW
+
 enum class LoggingLevel
 {
-    TRACE = BT_LOGGING_LEVEL_TRACE,
-    DEBUG = BT_LOGGING_LEVEL_DEBUG,
-    INFO = BT_LOGGING_LEVEL_INFO,
-    WARNING = BT_LOGGING_LEVEL_WARNING,
-    ERROR = BT_LOGGING_LEVEL_ERROR,
-    FATAL = BT_LOGGING_LEVEL_FATAL,
-    NONE = BT_LOGGING_LEVEL_NONE,
+    Trace = BT_LOGGING_LEVEL_TRACE,
+    Debug = BT_LOGGING_LEVEL_DEBUG,
+    Info = BT_LOGGING_LEVEL_INFO,
+    Warning = BT_LOGGING_LEVEL_WARNING,
+    Error = BT_LOGGING_LEVEL_ERROR,
+    Fatal = BT_LOGGING_LEVEL_FATAL,
+    None = BT_LOGGING_LEVEL_NONE,
 };
 
+BT_DIAG_POP
+
 } /* namespace bt2 */
 
 #endif /* BABELTRACE_CPP_COMMON_BT2_LOGGING_HPP */