Removing std::auto_ptr from 0.9-devel

deanberris · deanberris · commit 53254c48d50f · 2011-01-08T22:54:54.000+08:00
Because compilers in C++0x mode complain that std::auto_ptr is actually
deprecated, this patch changes the implementation to use raw pointers
instead. This is in the interim until unique_ptr&lt;&gt; is actually made part
of the standard or Boost so that it can be used instead.
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -49,7 +49,7 @@ namespace boost { namespace network { namespace http {
 
             async_client(bool cache_resolved, bool follow_redirect, boost::asio::io_service & service)
                 : connection_base(cache_resolved, follow_redirect),
-                service_ptr(),
+                service_ptr(0),
                 service_(service),
                 resolver_(service_),
                 sentinel_(new boost::asio::io_service::work(service_))
@@ -63,6 +63,7 @@ namespace boost { namespace network { namespace http {
                     lifetime_thread_->join();
                     lifetime_thread_.reset();
                 }
+                delete service_ptr;
             }
 
             basic_response<Tag> const request_skeleton(
@@ -76,7 +77,7 @@ namespace boost { namespace network { namespace http {
                 return connection_->send_request(method, request_, get_body);
             }
 
-            std::auto_ptr<boost::asio::io_service> service_ptr;
+            boost::asio::io_service * service_ptr;
             boost::asio::io_service & service_;
             resolver_type resolver_;
             boost::shared_ptr<boost::asio::io_service::work> sentinel_;
diff --git a/boost/network/protocol/http/client/pimpl.hpp b/boost/network/protocol/http/client/pimpl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace network { namespace http {
             typedef typename resolver<Tag>::type resolver_type;
             friend struct basic_client_impl<Tag,version_major,version_minor>;
 
-            std::auto_ptr<boost::asio::io_service> service_ptr;
+            boost::asio::io_service * service_ptr;
             boost::asio::io_service & service_;
             resolver_type resolver_;
 
@@ -48,12 +48,14 @@ namespace boost { namespace network { namespace http {
 
             sync_client(bool cache_resolved, bool follow_redirect, boost::asio::io_service & service)
                 : connection_base(cache_resolved, follow_redirect),
-                service_ptr(),
+                service_ptr(0),
                 service_(service),
                 resolver_(service_)
             {}
 
-            ~sync_client() {}
+            ~sync_client() {
+                delete service_ptr;
+            }
 
             basic_response<Tag> const request_skeleton(basic_request<Tag> const & request_, string_type method, bool get_body) {
                 typename connection_base::connection_ptr connection_;
diff --git a/boost/network/protocol/http/server/storage_base.hpp b/boost/network/protocol/http/server/storage_base.hpp
@@ -22,11 +22,16 @@ namespace boost { namespace network { namespace http {
 
         template <class ArgPack>
         server_storage_base(ArgPack const & args, has_io_service)
-        : self_service_()
+        : self_service_(0)
         , service_(args[_io_service])
         {}
 
-        std::auto_ptr<asio::io_service> self_service_;
+        ~server_storage_base() {
+            delete self_service_;
+            self_service_ = 0;
+        }
+
+        asio::io_service * self_service_;
         asio::io_service & service_;
     };
     
