NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit8a0381e

committed

Replaced boost asio with standalone (and header only) asio (v 1.11.0).

1 parent853550b commit8a0381eCopy full SHA for 8a0381e

File tree

44 files changed

+407

-402

lines changed

.gitmodules
CMakeLists.txt
boost/network
- protocol
  - http
  - stream_handler.hpp
- uri
  - builder.hpp
- utils
  - thread_pool.hpp
deps
- asio
libs/network
- example/http
- test

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+407

-402

lines changed

`‎.gitmodules`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,6 @@`
`10`	`10`	`[submodule "deps/cxxopts"]`
`11`	`11`	`path=deps/cxxopts`
`12`	`12`	`url=https://github.com/jarro2783/cxxopts.git`
	`13`	`+[submodule "deps/asio"]`
	`14`	`+path=deps/asio`
	`15`	`+url=https://github.com/chriskohlhoff/asio.git`

`‎CMakeLists.txt`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,11 @@ if (Boost_FOUND)`
`91`	`91`	`add_definitions(-D_WIN32_WINNT=0x0501)`
`92`	`92`	`endif(WIN32)`
`93`	`93`	`include_directories(${Boost_INCLUDE_DIRS})`
	`94`	`+`
	`95`	`+# Asio`
	`96`	`+add_definitions(-DASIO_HEADER_ONLY)`
	`97`	`+include_directories(deps/asio/asio/include)`
	`98`	`+`
`94`	`99`	`enable_testing()`
`95`	`100`	`add_subdirectory(libs/network/src)`
`96`	`101`	`if (CPP-NETLIB_BUILD_TESTS)`

`‎boost/network/protocol/http/client.hpp`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`#include<boost/network/protocol/http/response.hpp>`
`13`	`13`	`#include<boost/network/traits/ostringstream.hpp>`
`14`	`14`
`15`		`-#include<boost/asio/io_service.hpp>`
`16`	`15`	`#include<boost/algorithm/string/classification.hpp>`
`17`	`16`	`#include<boost/algorithm/string/split.hpp>`
`18`	`17`	`#include<istream>`

`‎boost/network/protocol/http/client/async_impl.hpp`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`#include<thread>`
`12`	`12`	`#include<memory>`
`13`	`13`	`#include<functional>`
`14`		`-#include<boost/asio/io_service.hpp>`
`15`		`-#include<boost/asio/strand.hpp>`
	`14`	`+#include<asio/io_service.hpp>`
	`15`	`+#include<asio/strand.hpp>`
`16`	`16`	`#include<boost/network/protocol/http/traits/connection_policy.hpp>`
`17`	`17`
`18`	`18`	`namespaceboost {`
`@@ -32,13 +32,13 @@ struct async_client`
`32`	`32`	`typedeftypename string<Tag>::type string_type;`
`33`	`33`
`34`	`34`	`typedef std::function<void(boost::iterator_range<charconst*>const&,`
`35`		`-system::error_codeconst&)> body_callback_function_type;`
	`35`	`+std::error_codeconst&)> body_callback_function_type;`
`36`	`36`
`37`	`37`	`typedef std::function<bool(string_type&)> body_generator_function_type;`
`38`	`38`
`39`	`39`	`async_client(bool cache_resolved,bool follow_redirect,`
`40`	`40`	`bool always_verify_peer,int timeout,`
`41`		`- std::shared_ptr<boost::asio::io_service> service,`
	`41`	`+ std::shared_ptr<asio::io_service> service,`
`42`	`42`	`optional<string_type> certificate_filename,`
`43`	`43`	`optional<string_type> verify_path,`
`44`	`44`	`optional<string_type> certificate_file,`
`@@ -47,10 +47,10 @@ struct async_client`
`47`	`47`	`: connection_base(cache_resolved, follow_redirect, timeout),`
`48`	`48`	`service_ptr(service.get()`
`49`	`49`	`? service`
`50`		`- : std::make_shared<boost::asio::io_service>()),`
	`50`	`+ : std::make_shared<asio::io_service>()),`
`51`	`51`	`service_(*service_ptr),`
`52`	`52`	`resolver_(service_),`
`53`		`- sentinel_(newboost::asio::io_service::work(service_)),`
	`53`	`+ sentinel_(new asio::io_service::work(service_)),`
`54`	`54`	`certificate_filename_(std::move(certificate_filename)),`
`55`	`55`	`verify_path_(std::move(verify_path)),`
`56`	`56`	`certificate_file_(std::move(certificate_file)),`
`@@ -59,7 +59,7 @@ struct async_client`
`59`	`59`	`ssl_options_(ssl_options),`
`60`	`60`	`always_verify_peer_(always_verify_peer) {`
`61`	`61`	`connection_base::resolver_strand_.reset(`
`62`		`-newboost::asio::io_service::strand(service_));`
	`62`	`+newasio::io_service::strand(service_));`
`63`	`63`	`if (!service)`
`64`	`64`	`lifetime_thread_.reset(newstd::thread([this] () { service_.run(); }));`
`65`	`65`	`}`
`@@ -87,10 +87,10 @@ struct async_client`
`87`	`87`	`generator);`
`88`	`88`	`}`
`89`	`89`
`90`		`- std::shared_ptr<boost::asio::io_service> service_ptr;`
`91`		`-boost::asio::io_service& service_;`
	`90`	`+ std::shared_ptr<asio::io_service> service_ptr;`
	`91`	`+ asio::io_service& service_;`
`92`	`92`	`resolver_type resolver_;`
`93`		`- std::shared_ptr<boost::asio::io_service::work> sentinel_;`
	`93`	`+ std::shared_ptr<asio::io_service::work> sentinel_;`
`94`	`94`	`std::shared_ptr<std::thread> lifetime_thread_;`
`95`	`95`	`optional<string_type> certificate_filename_;`
`96`	`96`	`optional<string_type> verify_path_;`

`‎boost/network/protocol/http/client/connection/async_base.hpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct async_connection_base {`
`30`	`30`	`typedef basic_request<Tag> request;`
`31`	`31`	`typedef basic_response<Tag> response;`
`32`	`32`	`typedef iterator_range<charconst *> char_const_range;`
`33`		`-typedef std::function<void(char_const_rangeconst &,system::error_codeconst &)>`
	`33`	`+typedef std::function<void(char_const_rangeconst &,std::error_codeconst &)>`
`34`	`34`	`body_callback_function_type;`
`35`	`35`	`typedef std::function<bool(string_type &)> body_generator_function_type;`
`36`	`36`	`typedef std::shared_ptr<this_type> connection_ptr;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8a0381e

File tree

44 files changed

Some content is hidden

44 files changed

`‎.gitmodules`

`‎CMakeLists.txt`

`‎boost/network/protocol/http/client.hpp`

`‎boost/network/protocol/http/client/async_impl.hpp`

`‎boost/network/protocol/http/client/connection/async_base.hpp`

0 commit comments