Merge pull request cpp-netlib#367 from ruslo/define.warnings

deanberris · deanberris · commit 3c9d02c2b7ef · 2014-01-19T16:31:30.000-08:00
Fix compiler warnings
diff --git a/logging/test/logging_log_record.cpp b/logging/test/logging_log_record.cpp
@@ -8,7 +8,9 @@
 #include <gtest/gtest.h>
 
 #include <network/logging/logging.hpp>
-#define NETWORK_ENABLE_LOGGING
+#ifndef NETWORK_ENABLE_LOGGING
+# define NETWORK_ENABLE_LOGGING
+#endif
 #include <network/detail/debug.hpp>
 
 using namespace network::logging;
@@ -73,4 +75,4 @@ TEST(logging_log_record, macro_log) {
   NETWORK_MESSAGE("This is a log through the macro.");
   NETWORK_MESSAGE("This is a log through the macro, with a stream! Num="
                   << 42 << " - OK!");
-}
+}
diff --git a/message/src/network/detail/debug.hpp b/message/src/network/detail/debug.hpp
@@ -15,7 +15,7 @@
 
     The user can force the logging to be enabled by defining NETWORK_ENABLE_LOGGING.
 */
-#if defined(NETWORK_DEBUG) && defined(NETWORK_ENABLE_LOGGING)
+#if defined(NETWORK_DEBUG) && !defined(NETWORK_ENABLE_LOGGING)
 #define NETWORK_ENABLE_LOGGING
 #endif
 
