Movatterモバイル変換

Skip to content

cpp-netlib/cpp-netlibPublic

forked fromglynos/cpp-netlib

NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commitbd35adb

glynos

committed

Replaced boost::shared_ptr with std::shared_ptr.

1 parent8a4c1a0 commitbd35adbCopy full SHA for bd35adb

File tree

28 files changed

+119

-120

lines changed

boost/network
- protocol
  - http
  - stream_handler.hpp
- utils
  - thread_pool.hpp
libs/network
- example/http
- test/http
  - client_constructor_test.cpp
  - server_constructor_test.cpp

28 files changed

+119

-120

lines changed

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

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,11 @@`
`9`	`9`	`// http://www.boost.org/LICENSE_1_0.txt)`
`10`	`10`
`11`	`11`	`#include<thread>`
	`12`	`+#include<memory>`
`12`	`13`	`#include<boost/asio/io_service.hpp>`
`13`	`14`	`#include<boost/asio/strand.hpp>`
`14`	`15`	`#include<boost/bind.hpp>`
`15`		`-#include<boost/make_shared.hpp>`
`16`	`16`	`#include<boost/network/protocol/http/traits/connection_policy.hpp>`
`17`		`-#include<boost/shared_ptr.hpp>`
`18`	`17`
`19`	`18`	`namespaceboost {`
`20`	`19`	`namespacenetwork {`
`@@ -39,7 +38,7 @@ struct async_client`
`39`	`38`
`40`	`39`	`async_client(bool cache_resolved,bool follow_redirect,`
`41`	`40`	`bool always_verify_peer,int timeout,`
`42`		`-boost::shared_ptr<boost::asio::io_service> service,`
	`41`	`+std::shared_ptr<boost::asio::io_service> service,`
`43`	`42`	`optional<string_type> certificate_filename,`
`44`	`43`	`optional<string_type> verify_path,`
`45`	`44`	`optional<string_type> certificate_file,`
`@@ -48,7 +47,7 @@ struct async_client`
`48`	`47`	`: connection_base(cache_resolved, follow_redirect, timeout),`
`49`	`48`	`service_ptr(service.get()`
`50`	`49`	`? service`
`51`		`- :boost::make_shared<boost::asio::io_service>()),`
	`50`	`+ :std::make_shared<boost::asio::io_service>()),`
`52`	`51`	`service_(*service_ptr),`
`53`	`52`	`resolver_(service_),`
`54`	`53`	`sentinel_(new boost::asio::io_service::work(service_)),`
`@@ -88,11 +87,11 @@ struct async_client`
`88`	`87`	`generator);`
`89`	`88`	`}`
`90`	`89`
`91`		`-boost::shared_ptr<boost::asio::io_service> service_ptr;`
	`90`	`+std::shared_ptr<boost::asio::io_service> service_ptr;`
`92`	`91`	`boost::asio::io_service& service_;`
`93`	`92`	`resolver_type resolver_;`
`94`		`-boost::shared_ptr<boost::asio::io_service::work> sentinel_;`
`95`		`-boost::shared_ptr<std::thread> lifetime_thread_;`
	`93`	`+std::shared_ptr<boost::asio::io_service::work> sentinel_;`
	`94`	`+std::shared_ptr<std::thread> lifetime_thread_;`
`96`	`95`	`optional<string_type> certificate_filename_;`
`97`	`96`	`optional<string_type> verify_path_;`
`98`	`97`	`optional<string_type> certificate_file_;`

`‎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
`@@ -32,7 +32,7 @@ struct async_connection_base {`
`32`	`32`	`typedef function<void(char_const_rangeconst &, system::error_codeconst &)>`
`33`	`33`	`body_callback_function_type;`
`34`	`34`	`typedef function<bool(string_type &)> body_generator_function_type;`
`35`		`-typedef shared_ptr<this_type> connection_ptr;`
	`35`	`+typedefstd::shared_ptr<this_type> connection_ptr;`
`36`	`36`
`37`	`37`	`// This is the factory function which constructs the appropriate async`
`38`	`38`	`// connection implementation with the correct delegate chosen based on the`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ template <class Tag, unsigned version_major, unsigned version_minor>`
`49`	`49`	`structhttp_async_connection`
`50`	`50`	`: async_connection_base<Tag, version_major, version_minor>,`
`51`	`51`	`protected http_async_protocol_handler<Tag, version_major, version_minor>,`
`52`		`-boost::enable_shared_from_this<`
	`52`	`+std::enable_shared_from_this<`
`53`	`53`	`http_async_connection<Tag, version_major, version_minor> > {`
`54`	`54`	`http_async_connection(http_async_connectionconst&) =delete;`
`55`	`55`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ struct normal_delegate;`
`28`	`28`
`29`	`29`	`template<classTag>`
`30`	`30`	`structconnection_delegate_factory {`
`31`		`-typedef shared_ptr<connection_delegate> connection_delegate_ptr;`
	`31`	`+typedefstd::shared_ptr<connection_delegate> connection_delegate_ptr;`
`32`	`32`	`typedeftypename string<Tag>::type string_type;`
`33`	`33`
`34`	`34`	`// This is the factory method that actually returns the delegate`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`#include<boost/asio/io_service.hpp>`
`11`	`11`	`#include<boost/asio/ssl.hpp>`
`12`		`-#include<boost/enable_shared_from_this.hpp>`
`13`	`12`	`#include<boost/network/protocol/http/client/connection/connection_delegate.hpp>`
`14`	`13`	`#include<boost/network/support/is_default_string.hpp>`
`15`	`14`	`#include<boost/network/support/is_default_wstring.hpp>`
`@@ -22,7 +21,7 @@ namespace http {`
`22`	`21`	`namespaceimpl {`
`23`	`22`
`24`	`23`	`structssl_delegate : connection_delegate,`
`25`		`- enable_shared_from_this<ssl_delegate> {`
	`24`	`+std::enable_shared_from_this<ssl_delegate> {`
`26`	`25`	`ssl_delegate(asio::io_service &service,bool always_verify_peer,`
`27`	`26`	`optional<std::string> certificate_filename,`
`28`	`27`	`optional<std::string> verify_path,`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ template <class Tag, unsigned version_major, unsigned version_minor>`
`31`	`31`	`structhttp_sync_connection`
`32`	`32`	`: publicvirtual sync_connection_base<Tag, version_major, version_minor>,`
`33`	`33`	`sync_connection_base_impl<Tag, version_major, version_minor>,`
`34`		`-boost::enable_shared_from_this<`
	`34`	`+std::enable_shared_from_this<`
`35`	`35`	`http_sync_connection<Tag, version_major, version_minor> > {`
`36`	`36`	`typedeftypename resolver_policy<Tag>::type resolver_base;`
`37`	`37`	`typedeftypename resolver_base::resolver_type resolver_type;`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ template <class Tag, unsigned version_major, unsigned version_minor>`
`34`	`34`	`structhttps_sync_connection`
`35`	`35`	`: publicvirtual sync_connection_base<Tag, version_major, version_minor>,`
`36`	`36`	`sync_connection_base_impl<Tag, version_major, version_minor>,`
`37`		`-boost::enable_shared_from_this<`
	`37`	`+std::enable_shared_from_this<`
`38`	`38`	`https_sync_connection<Tag, version_major, version_minor> > {`
`39`	`39`	`typedeftypename resolver_policy<Tag>::type resolver_base;`
`40`	`40`	`typedeftypename resolver_base::resolver_type resolver_type;`

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`8`	`8`	`// http://www.boost.org/LICENSE_1_0.txt)`
`9`	`9`
	`10`	`+#include<memory>`
`10`	`11`	`#include<boost/network/protocol/http/client/pimpl.hpp>`
`11`	`12`	`#include<boost/network/protocol/http/request.hpp>`
`12`	`13`	`#include<boost/network/protocol/http/response.hpp>`
`@@ -299,7 +300,7 @@ class basic_client_facade {`
`299`	`300`	`voidclear_resolved_cache() { pimpl->clear_resolved_cache(); }`
`300`	`301`
`301`	`302`	`protected:`
`302`		`-boost::shared_ptr<pimpl_type> pimpl;`
	`303`	`+std::shared_ptr<pimpl_type> pimpl;`
`303`	`304`
`304`	`305`	`voidinit_pimpl(client_options<Tag>const& options) {`
`305`	`306`	`pimpl.reset(newpimpl_type(`

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@`
`7`	`7`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`8`	`8`	`// http://www.boost.org/LICENSE_1_0.txt)`
`9`	`9`
	`10`	`+#include<memory>`
`10`	`11`	`#include<boost/asio/io_service.hpp>`
`11`	`12`	`#include<boost/network/traits/string.hpp>`
`12`	`13`	`#include<boost/optional/optional.hpp>`
`13`		`-#include<boost/smart_ptr/shared_ptr.hpp>`
`14`	`14`
`15`	`15`	`namespaceboost {`
`16`	`16`	`namespacenetwork {`
`@@ -107,7 +107,7 @@ class client_options {`
`107`	`107`	`return *this;`
`108`	`108`	`}`
`109`	`109`
`110`		`- client_options&io_service(boost::shared_ptr<boost::asio::io_service> v) {`
	`110`	`+ client_options&io_service(std::shared_ptr<boost::asio::io_service> v) {`
`111`	`111`	`io_service_ = v;`
`112`	`112`	`return *this;`
`113`	`113`	`}`
`@@ -148,7 +148,7 @@ class client_options {`
`148`	`148`
`149`	`149`	`longopenssl_options()const {return openssl_options_; }`
`150`	`150`
`151`		`-boost::shared_ptr<boost::asio::io_service>io_service()const {`
	`151`	`+std::shared_ptr<boost::asio::io_service>io_service()const {`
`152`	`152`	`return io_service_;`
`153`	`153`	`}`
`154`	`154`
`@@ -165,7 +165,7 @@ class client_options {`
`165`	`165`	`boost::optional<string_type> openssl_private_key_file_;`
`166`	`166`	`boost::optional<string_type> openssl_ciphers_;`
`167`	`167`	`long openssl_options_;`
`168`		`-boost::shared_ptr<boost::asio::io_service> io_service_;`
	`168`	`+std::shared_ptr<boost::asio::io_service> io_service_;`
`169`	`169`	`bool always_verify_peer_;`
`170`	`170`	`int timeout_;`
`171`	`171`	`};`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`7`	`7`	`// http://www.boost.org/LICENSE_1_0.txt)`
`8`	`8`
	`9`	`+#include<memory>`
`9`	`10`	`#include<boost/asio/io_service.hpp>`
`10`	`11`	`#include<boost/mpl/and.hpp>`
`11`	`12`	`#include<boost/mpl/if.hpp>`
`@@ -16,7 +17,6 @@`
`16`	`17`	`#include<boost/network/support/is_async.hpp>`
`17`	`18`	`#include<boost/network/support/is_sync.hpp>`
`18`	`19`	`#include<boost/optional/optional.hpp>`
`19`		`-#include<boost/smart_ptr/shared_ptr.hpp>`
`20`	`20`	`#include<boost/static_assert.hpp>`
`21`	`21`
`22`	`22`	`namespaceboost {`
`@@ -74,7 +74,7 @@ struct basic_client_impl`
`74`	`74`	`optional<string_type>const& certificate_file,`
`75`	`75`	`optional<string_type>const& private_key_file,`
`76`	`76`	`optional<string_type>const& ciphers,long ssl_options,`
`77`		`-boost::shared_ptr<boost::asio::io_service> service,`
	`77`	`+std::shared_ptr<boost::asio::io_service> service,`
`78`	`78`	`int timeout)`
`79`	`79`	`: base_type(cache_resolved, follow_redirect, always_verify_peer, timeout,`
`80`	`80`	`service, certificate_filename, verify_path, certificate_file,`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp