Merge remote-tracking branch 'upstream/master'

glynos · glynos · commit 4d2389bd78cf · 2014-01-25T14:58:16.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,15 +77,14 @@ endif()
 
 message(STATUS "C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
-if (Boost_FOUND)
-  if (MSVC)
-    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-  endif(MSVC)
-  if (WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0501)
-  endif(WIN32)
-  include_directories(${Boost_INCLUDE_DIRS})
-endif(Boost_FOUND)
+
+if (MSVC)
+  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+endif(MSVC)
+if (WIN32)
+  add_definitions(-D_WIN32_WINNT=0x0501)
+endif(WIN32)
+include_directories(${Boost_INCLUDE_DIRS})
 
 message(STATUS "CPP-NETLIB options selected:")
 message(STATUS "  CPP-NETLIB_BUILD_SHARED_LIBS:      ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
diff --git a/error/src/error.cpp b/error/src/error.cpp
@@ -5,6 +5,7 @@
 
 #include <network/error.hpp>
 #include <cstring>
+#include <string>
 
 namespace network {
 
diff --git a/http/src/http/v2/client/client_errors.cpp b/http/src/http/v2/client/client_errors.cpp
@@ -5,6 +5,7 @@
 
 #include <network/config.hpp>
 #include <network/http/v2/client/client_errors.hpp>
+#include <string>
 
 namespace network {
   namespace http {
diff --git a/http/src/network/protocol/http/client/options.ipp b/http/src/network/protocol/http/client/options.ipp
@@ -30,7 +30,7 @@ class client_options_pimpl {
   }
 
   void io_service(boost::asio::io_service* io_service) {
-    io_service_ = io_service_;
+    io_service_ = io_service;
   }
 
   boost::asio::io_service* io_service() const { return io_service_; }
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
 
diff --git a/mime/test/CMakeLists.txt b/mime/test/CMakeLists.txt
@@ -13,9 +13,6 @@ endif()
 
 include_directories(${CPP-NETLIB_SOURCE_DIR}/mime/src)
 
-if ( Boost_FOUND )
-    add_executable ( mime-roundtrip mime-roundtrip.cpp )
-    target_link_libraries ( mime-roundtrip )
-    add_test ( mime-roundtrip mime-roundtrip )
-endif ()
-
+add_executable ( mime-roundtrip mime-roundtrip.cpp )
+target_link_libraries ( mime-roundtrip )
+add_test ( mime-roundtrip mime-roundtrip )

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class client_options_pimpl {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`void io_service(boost::asio::io_service* io_service) {`
`33`		`- io_service_ = io_service_;`
	`33`	`+ io_service_ = io_service;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`boost::asio::io_service* io_service() const { return io_service_; }`