Merge remote-tracking branch 'deanberris/master' into merge-std

Author: glynos

.gitignore

@@ -10,4 +10,7 @@ libs/mime/test/mime-roundtrip
 bin/
 tests/
 _build
+CPP-NETLIB.*
+CMakeScripts/
+*.cmake
 *~

CMakeLists.txt

@@ -24,9 +24,9 @@ else()
 endif()
 set(Boost_USE_MULTITHREADED ON)
 if(CPP-NETLIB_BUILD_TESTS)
-  set(Boost_COMPONENTS unit_test_framework system regex date_time thread chrono filesystem program_options )
+  set(Boost_COMPONENTS unit_test_framework system regex date_time filesystem program_options )
 else()
-  set(Boost_COMPONENTS system regex date_time thread chrono filesystem program_options )
+  set(Boost_COMPONENTS system regex date_time filesystem program_options )
 endif()
 find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )
@@ -45,7 +45,6 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
   CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
   CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
-
   if (HAVE_STD11)
     set(CMAKE_CXX_FLAGS -std=c++11)
   elseif (HAVE_STD0X)
@@ -54,12 +53,23 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     message(FATAL_ERROR "No advanced standard C++ support (-std=c++0x and -std=c++11 not defined).")
   endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
-  set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++")
-  set(CMAKE_CXX_LINK_FLAGS "-std=c++11 -stdlib=libc++")
-  message("C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
+  INCLUDE(CheckCXXCompilerFlag)
+  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
+  if (HAVE_STD11)
+    set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++")
+    set(CMAKE_CXX_LINK_FLAGS "-std=c++11 -stdlib=libc++")
+  else()
+    message(FATAL_ERROR "No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")
+  endif()
+  add_definitions(
+  -DASIO_HAS_MOVE -DASIO_HAS_VARIADIC_TEMPLATES -DASIO_HAS_STD_SYSTEM_ERROR
+  -DASIO_ERROR_CATEGORY_NOEXCEPT=noexcept -DASIO_HAS_STD_ARRAY
+  -DASIO_HAS_STD_SHARED_PTR -DASIO_HAS_STD_ATOMIC -DASIO_HAS_STD_CHRONO
+  -DASIO_HAS_STD_ADDRESSOFF -DASIO_HAS_STD_FUNCTION -DASIO_HAS_STD_TYPE_TRAITS)
 endif()
 
-
+message("C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
+message("C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
 if (Boost_FOUND)
     if (MSVC)
       add_definitions(-D_SCL_SECURE_NO_WARNINGS)

include/network/message/directives/detail/string_value.hpp

@@ -10,7 +10,7 @@
 #include <network/traits/string.hpp>
 #include <network/support/is_async.hpp>
 #include <network/support/is_sync.hpp>
-#include <boost/thread/future.hpp>
+#include <future>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/or.hpp>

include/network/message/message.hpp

@@ -9,71 +9,68 @@
 
 #include <string>
 #include <map>
-#include <boost/function.hpp>
+#include <functional>
 #include <network/message/message_base.hpp>
 #include <boost/shared_container_iterator.hpp>
 
 namespace network {
 
-struct message_pimpl;
+  struct message_pimpl;
 
-// The common message type.
-struct message : message_base {
-  // Nested types
-  typedef boost::iterator_range<
+  // The common message type.
+  struct message : message_base {
+    // Nested types
+    typedef boost::iterator_range<
     std::multimap<std::string, std::string>::const_iterator>
     headers_range;
 
-  // Constructors
-  message();
-  message(message const & other);
+    // Constructors
+    message();
+    message(message const & other);
+    message(message && other) = default;
 
-  // Assignment
-  message & operator=(message other);
+    // Assignment
+    message& operator=(message const &other);
+    message& operator=(message &&other);
 
-  // Mutators
-  virtual void set_destination(std::string const & destination);
-  virtual void set_source(std::string const & source);
-  virtual void append_header(std::string const & name,
-                             std::string const & value);
-  virtual void remove_headers(std::string const & name);
-  virtual void remove_headers();
-  virtual void set_body(std::string const & body);
-  virtual void append_body(std::string const & data);
+    // Mutators
+    virtual void set_destination(std::string const & destination);
+    virtual void set_source(std::string const & source);
+    virtual void append_header(std::string const & name,
+                               std::string const & value);
+    virtual void remove_headers(std::string const & name);
+    virtual void remove_headers();
+    virtual void set_body(std::string const & body);
+    virtual void append_body(std::string const & data);
 
-  // Retrievers
-  virtual void get_destination(std::string & destination) const;
-  virtual void get_source(std::string & source) const;
-  virtual void get_headers(
-      boost::function<void(std::string const &, std::string const &)> inserter) const;
-  virtual void get_headers(
-      std::string const & name,
-      boost::function<void(std::string const &, std::string const &)> inserter) const;
-  virtual void get_headers(
-      boost::function<bool(std::string const &, std::string const &)> predicate,
-      boost::function<void(std::string const &, std::string const &)> inserter) const;
-  virtual void get_body(std::string & body) const;
-  virtual void get_body(
-      boost::function<void(boost::iterator_range<char const *>)> chunk_reader,
-      size_t size) const;
+    // Retrievers
+    virtual void get_destination(std::string & destination) const;
+    virtual void get_source(std::string & source) const;
+    virtual void get_headers(std::function<void(std::string const &, std::string const &)> inserter) const;
+    virtual void get_headers(std::string const & name,
+                             std::function<void(std::string const &, std::string const &)> inserter) const;
+    virtual void get_headers(std::function<bool(std::string const &, std::string const &)> predicate,
+                             std::function<void(std::string const &, std::string const &)> inserter) const;
+    virtual void get_body(std::string & body) const;
+    virtual void get_body(std::function<void(std::string::const_iterator, size_t)> chunk_reader, size_t size) const;
 
-  void swap(message & other);
+    void swap(message & other);
 
-  // Destructor
-  virtual ~message();
- private:
-  message_pimpl * pimpl;
-};
+    // Destructor
+    virtual ~message();
+  private:
+    message_pimpl * pimpl;
+  };
 
-inline void swap(message & left, message & right) {
+  inline void swap(message & left, message & right) {
     left.swap(right);
-}
+  }
 
-template <class Directive>
-message_base & operator<< (message_base & msg, Directive directive) {
-  directive(msg);
-  return msg;
-}
+  template <class Directive>
+  message_base & operator<< (message_base & msg, Directive directive) {
+    directive(msg);
+    return msg;
+  }
 
 }  // namespace network