Merge pull request #276 from glynos/master

deanberris · deanberris · commit ae467f39e946 · 2013-07-28T19:06:47.000-07:00
Added config.hpp to project (similar to uri/config.hpp) for compiler portability
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,6 +127,7 @@ endif()
 
 if(CPP-NETLIB_BUILD_SINGLE_LIB)
   include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/config/src
     ${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
     ${CMAKE_CURRENT_SOURCE_DIR}/http/src
     ${CMAKE_CURRENT_SOURCE_DIR}/logging/src
diff --git a/config/src/network/config.hpp b/config/src/network/config.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) Glyn Matthews 2012, 2013.
+// Copyright 2012 Dean Michael Berris <dberris@google.com>
+// Copyright 2012 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef NETWORK_CONFIG_INC
+#define NETWORK_CONFIG_INC
+
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+
+#if defined(BOOST_ALL_DYN_LINK)
+#define NETWORK_DECL BOOST_SYMBOL_EXPORT
+#else
+#define NETWORK_DECL
+#endif // defined(BOOST_ALL_DYN_LINK)
+
+#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+#define NETWORK_DEFAULTED_FUNCTION {}
+#else
+#define NETWORK_DEFAULTED_FUNCTION = default
+#endif // defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+
+#if defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
+#define NETWORK_DELETED_FUNCTION {}
+#else
+#define NETWORK_DELETED_FUNCTION = delete
+#endif // defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
+
+#if defined(BOOST_NO_CXX11_NOEXCEPT)
+#define NETWORK_NOEXCEPT throw()
+#else
+#define NETWORK_NOEXCEPT noexcept
+#endif // defined(BOOST_NO_CXX11_NOEXCEPT)
+
+#if defined(BOOST_NO_CXX11_OVERRIDE)
+#define NETWORK_OVERRIDE
+#else
+#define NETWORK_OVERRIDE override
+#endif // defined(BOOST_NO_CXX11_OVERRIDE)
+
+#endif // NETWORK_CONFIG_INC
diff --git a/uri b/uri
@@ -1 +1 @@
-Subproject commit 32ea2a75f8738f7ae7aa069062a9d78cfc5c870e
+Subproject commit 9f9d62874da832e81a858e14013c6d080a12cb56
