NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit53254c4

committed

Removing std::auto_ptr from 0.9-devel

Because compilers in C++0x mode complain that std::auto_ptr is actuallydeprecated, this patch changes the implementation to use raw pointersinstead. This is in the interim until unique_ptr<> is actually made partof the standard or Boost so that it can be used instead.

1 parentfe28613 commit53254c4Copy full SHA for 53254c4

File tree

3 files changed

+15

-7

lines changed

boost/network/protocol/http
- client
  - async_impl.hpp
  - pimpl.hpp
- server
  - storage_base.hpp

3 files changed

+15

-7

lines changed

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

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ namespace boost { namespace network { namespace http {`
`49`	`49`
`50`	`50`	`async_client(bool cache_resolved,bool follow_redirect, boost::asio::io_service & service)`
`51`	`51`	`: connection_base(cache_resolved, follow_redirect),`
`52`		`- service_ptr(),`
	`52`	`+ service_ptr(0),`
`53`	`53`	`service_(service),`
`54`	`54`	`resolver_(service_),`
`55`	`55`	`sentinel_(new boost::asio::io_service::work(service_))`
`@@ -63,6 +63,7 @@ namespace boost { namespace network { namespace http {`
`63`	`63`	`lifetime_thread_->join();`
`64`	`64`	`lifetime_thread_.reset();`
`65`	`65`	`}`
	`66`	`+delete service_ptr;`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`basic_response<Tag>constrequest_skeleton(`
`@@ -76,7 +77,7 @@ namespace boost { namespace network { namespace http {`
`76`	`77`	`return connection_->send_request(method, request_, get_body);`
`77`	`78`	`}`
`78`	`79`
`79`		`-std::auto_ptr<boost::asio::io_service> service_ptr;`
	`80`	`+ boost::asio::io_service * service_ptr;`
`80`	`81`	`boost::asio::io_service & service_;`
`81`	`82`	`resolver_type resolver_;`
`82`	`83`	`boost::shared_ptr<boost::asio::io_service::work> sentinel_;`

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

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace boost { namespace network { namespace http {`
`35`	`35`	`typedeftypename resolver<Tag>::type resolver_type;`
`36`	`36`	`friendstructbasic_client_impl<Tag,version_major,version_minor>;`
`37`	`37`
`38`		`-std::auto_ptr<boost::asio::io_service> service_ptr;`
	`38`	`+ boost::asio::io_service * service_ptr;`
`39`	`39`	`boost::asio::io_service & service_;`
`40`	`40`	`resolver_type resolver_;`
`41`	`41`
`@@ -48,12 +48,14 @@ namespace boost { namespace network { namespace http {`
`48`	`48`
`49`	`49`	`sync_client(bool cache_resolved,bool follow_redirect, boost::asio::io_service & service)`
`50`	`50`	`: connection_base(cache_resolved, follow_redirect),`
`51`		`- service_ptr(),`
	`51`	`+ service_ptr(0),`
`52`	`52`	`service_(service),`
`53`	`53`	`resolver_(service_)`
`54`	`54`	`{}`
`55`	`55`
`56`		`-~sync_client() {}`
	`56`	`+~sync_client() {`
	`57`	`+delete service_ptr;`
	`58`	`+ }`
`57`	`59`
`58`	`60`	`basic_response<Tag>constrequest_skeleton(basic_request<Tag>const & request_, string_type method,bool get_body) {`
`59`	`61`	`typename connection_base::connection_ptr connection_;`

`‎boost/network/protocol/http/server/storage_base.hpp`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,16 @@ namespace boost { namespace network { namespace http {`
`22`	`22`
`23`	`23`	`template<classArgPack>`
`24`	`24`	`server_storage_base(ArgPackconst & args, has_io_service)`
`25`		`- : self_service_()`
	`25`	`+ : self_service_(0)`
`26`	`26`	`, service_(args[_io_service])`
`27`	`27`	`{}`
`28`	`28`
`29`		`- std::auto_ptr<asio::io_service> self_service_;`
	`29`	`+~server_storage_base() {`
	`30`	`+delete self_service_;`
	`31`	`+ self_service_ =0;`
	`32`	`+ }`
	`33`	`+`
	`34`	`+ asio::io_service * self_service_;`
`30`	`35`	`asio::io_service & service_;`
`31`	`36`	`};`
`32`	`37`

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!

Commit53254c4

File tree

3 files changed

3 files changed

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

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

`‎boost/network/protocol/http/server/storage_base.hpp`

0 commit comments