Commit769be88

committed

Merge pull request#659 from burannah/asio_standalone

Asio standalone

2 parents1d767d2 +297b5bf commit769be88Copy full SHA for 769be88

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ if (Boost_FOUND)`
`98`	`98`	`include_directories(${Boost_INCLUDE_DIRS})`
`99`	`99`
`100`	`100`	`# Asio`
`101`		`- add_definitions(-DASIO_HEADER_ONLY)`
	`101`	`+ add_definitions(-DASIO_STANDALONE)`
`102`	`102`	`include_directories(deps/asio/asio/include)`
`103`	`103`
`104`	`104`	`enable_testing()`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include<iterator>`
`13`	`13`	`#include<cstdint>`
`14`	`14`	`#include<boost/algorithm/string/trim.hpp>`
`15`		`-#include<asio/deadline_timer.hpp>`
	`15`	`+#include<asio/steady_timer.hpp>`
`16`	`16`	`#include<asio/placeholders.hpp>`
`17`	`17`	`#include<asio/strand.hpp>`
`18`	`18`	`#include<asio/streambuf.hpp>`
`@@ -109,7 +109,7 @@ struct http_async_connection`
`109`	`109`	`callback, generator, ec, endpoint_range);`
`110`	`110`	`}));`
`111`	`111`	`if (timeout_ >0) {`
`112`		`- timer_.expires_from_now(boost::posix_time::seconds(timeout_));`
	`112`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`113`	`113`	`timer_.async_wait(request_strand_.wrap([=] (std::error_codeconst &ec) {`
`114`	`114`	`self->handle_timeout(ec);`
`115`	`115`	`}));`
`@@ -508,7 +508,7 @@ struct http_async_connection`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`int timeout_;`
`511`		`- ::asio::deadline_timer timer_;`
	`511`	`+ ::asio::steady_timer timer_;`
`512`	`512`	`bool is_timedout_;`
`513`	`513`	`bool follow_redirect_;`
`514`	`514`	`resolver_type& resolver_;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`#include<iterator>`
`12`	`12`	`#include<functional>`
`13`		`-#include<asio/deadline_timer.hpp>`
	`13`	`+#include<asio/steady_timer.hpp>`
`14`	`14`	`#include<asio/streambuf.hpp>`
`15`	`15`	`#include<boost/network/protocol/http/algorithms/linearize.hpp>`
`16`	`16`	`#include<boost/network/protocol/http/response.hpp>`
`@@ -77,7 +77,7 @@ struct http_sync_connection`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`if (timeout_ >0) {`
`80`		`- timer_.expires_from_now(boost::posix_time::seconds(timeout_));`
	`80`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`81`	`81`	`auto self =this->shared_from_this();`
`82`	`82`	`timer_.async_wait([=] (std::error_codeconst &ec) {`
`83`	`83`	`self->handle_timeout(ec);`
`@@ -132,7 +132,7 @@ struct http_sync_connection`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`int timeout_;`
`135`		`- ::asio::deadline_timer timer_;`
	`135`	`+ ::asio::steady_timer timer_;`
`136`	`136`	`resolver_type& resolver_;`
`137`	`137`	`resolver_function_type resolve_;`
`138`	`138`	`::asio::ip::tcp::socket socket_;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ struct https_sync_connection`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`if (timeout_ >0) {`
`122`		`- timer_.expires_from_now(boost::posix_time::seconds(timeout_));`
	`122`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`123`	`123`	`auto self =this->shared_from_this();`
`124`	`124`	`timer_.async_wait(`
`125`	`125`	`[=](std::error_codeconst& ec) { self->handle_timeout(ec); });`
`@@ -173,7 +173,7 @@ struct https_sync_connection`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`int timeout_;`
`176`		`- ::asio::deadline_timer timer_;`
	`176`	`+ ::asio::steady_timer timer_;`
`177`	`177`	`resolver_type& resolver_;`
`178`	`178`	`resolver_function_type resolve_;`
`179`	`179`	`::asio::ssl::context context_;`

Comments

(0)