squash: add proper boost.asio defines for supporting clang

deanberris · deanberris · commit a34471238e5c · 2017-04-06T20:25:56.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,7 +97,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
   # We want to link in C++11 mode in Clang too, but also set a high enough
   # template depth for the template metaprogramming.
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11")
+  set (CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -DBOOST_ASIO_HAS_STD_CHRONO -DBOOST_ASIO_HAS_STD_ARRAY")
   if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     # Use libc++ only in OS X.
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
diff --git a/boost/network/protocol/http/client/connection/async_normal.hpp b/boost/network/protocol/http/client/connection/async_normal.hpp
@@ -147,7 +147,7 @@ struct http_async_connection
       connection_delegate_ptr;
 
   http_async_connection(resolver_type& resolver, resolve_function resolve,
-                        bool follow_redirect, int timeout,
+                        bool follow_redirect, int64_t timeout,
                         bool remove_chunk_markers,
                         connection_delegate_ptr delegate)
       : timeout_(timeout),
@@ -187,7 +187,7 @@ struct http_async_connection
                                                           callback, generator, ec, endpoint_range);
                                   }));
     if (timeout_ > 0) {
-      timer_.expires_from_now(boost::chrono::seconds(timeout_));
+      timer_.expires_from_now(std::chrono::seconds(timeout_));
       timer_.async_wait(request_strand_.wrap([=] (boost::system::error_code const &ec) {
             self->handle_timeout(ec);
           }));
@@ -578,7 +578,7 @@ struct http_async_connection
     }
   }
 
-  int timeout_;
+  int64_t timeout_;
   bool remove_chunk_markers_;
   boost::asio::steady_timer timer_;
   bool is_timedout_;
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -345,7 +345,7 @@ struct async_connection
   }
 
  private:
-  typedef boost::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>
+  typedef std::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>
       buffer_type;
 
  public:

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ struct async_connection`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`private:`
`348`		`- typedef boost::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>`
	`348`	`+ typedef std::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>`
`349`	`349`	`buffer_type;`
`350`	`350`
`351`	`351`	`public:`