Commita344712

committed

squash: add proper boost.asio defines for supporting clang

1 parentd42f0b3 commita344712Copy full SHA for a344712

File tree

-5

lines changed

CMakeLists.txt
boost/network/protocol/http
- client/connection
  - async_normal.hpp
- server
  - async_connection.hpp

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)`
`97`	`97`	`elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)`
`98`	`98`	`# We want to link in C++11 mode in Clang too, but also set a high enough`
`99`	`99`	`# template depth for the template metaprogramming.`
`100`		`- set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11")`
	`100`	`+ set (CMAKE_CXX_FLAGS`
	`101`	`+"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -DBOOST_ASIO_HAS_STD_CHRONO -DBOOST_ASIO_HAS_STD_ARRAY")`
`101`	`102`	`if (${CMAKE_SYSTEM_NAME}MATCHES"Darwin")`
`102`	`103`	`# Use libc++ only in OS X.`
`103`	`104`	`set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -stdlib=libc++")`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ struct http_async_connection`
`147`	`147`	`connection_delegate_ptr;`
`148`	`148`
`149`	`149`	`http_async_connection(resolver_type& resolver, resolve_function resolve,`
`150`		`-bool follow_redirect,int timeout,`
	`150`	`+bool follow_redirect,int64_t timeout,`
`151`	`151`	`bool remove_chunk_markers,`
`152`	`152`	`connection_delegate_ptr delegate)`
`153`	`153`	`: timeout_(timeout),`
`@@ -187,7 +187,7 @@ struct http_async_connection`
`187`	`187`	`callback, generator, ec, endpoint_range);`
`188`	`188`	`}));`
`189`	`189`	`if (timeout_ >0) {`
`190`		`- timer_.expires_from_now(boost::chrono::seconds(timeout_));`
	`190`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`191`	`191`	`timer_.async_wait(request_strand_.wrap([=] (boost::system::error_codeconst &ec) {`
`192`	`192`	`self->handle_timeout(ec);`
`193`	`193`	`}));`
`@@ -578,7 +578,7 @@ struct http_async_connection`
`578`	`578`	`}`
`579`	`579`	`}`
`580`	`580`
`581`		`-int timeout_;`
	`581`	`+int64_t timeout_;`
`582`	`582`	`bool remove_chunk_markers_;`
`583`	`583`	`boost::asio::steady_timer timer_;`
`584`	`584`	`bool is_timedout_;`

Lines changed: 1 addition & 1 deletion

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`		`-typedefboost::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>`
	`348`	`+typedefstd::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>`
`349`	`349`	`buffer_type;`
`350`	`350`
`351`	`351`	`public:`

Comments

(0)