use unique_ptr instead of auto_ptr

ACE/ACEXML/examples/SAXPrint/main.cpp

@@ -6,7 +6,7 @@
 #include "Print_Handler.h"
 #include "SAXPrint_Handler.h"
 #include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
 

ACE/ACEXML/parser/parser/Parser.cpp

@@ -13,6 +13,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Array_Ptr
+
 static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA");
 static const ACEXML_Char empty_string[] = { 0 };
 

ACE/ACEXML/parser/parser/Parser.h

@@ -29,7 +29,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/Containers_T.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ACEXML/parser/parser/Entity_Manager.h"
 #include "ACEXML/parser/parser/ParserInternals.h"
 #include "ACEXML/parser/parser/ParserContext.h"

ACE/Kokyu/Default_Dispatcher_Impl.h

@@ -23,7 +23,8 @@
 #include "Kokyu_defs.h"
 #include "Dispatcher_Impl.h"
 #include "Dispatcher_Task.h"
-#include <memory>
+
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Array_Ptr
 
 namespace Kokyu
 {

ACE/Kokyu/Kokyu_defs.h

@@ -10,7 +10,7 @@
 #include /**/ "ace/pre.h"
 #include "ace/Containers_T.h"
 #include "ace/Time_Value.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Message_Block.h"
 #include "ace/Sched_Params.h"
 #include "ace/Malloc_Allocator.h"

ACE/Kokyu/tests/DSRT_MIF/MIF.cpp

@@ -1,5 +1,5 @@
 #include "ace/ACE.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Task.h"
 #include "ace/Sched_Params.h"
 #include "ace/Atomic_Op.h"

ACE/ace/ACE.cpp

@@ -2,7 +2,7 @@
 
 #include "ace/Basic_Types.h"
 #include "ace/Handle_Set.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/SString.h"
 #include "ace/Version.h"
 #include "ace/Message_Block.h"

ACE/ace/OS_NS_Thread.cpp

@@ -13,7 +13,7 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_ctype.h"
 #include "ace/Log_Category.h" // for ACE_ASSERT
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Thread_Mutex.h"
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Guard_T.h"

ACE/ace/OS_NS_unistd.cpp

@@ -11,7 +11,6 @@
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/os_include/sys/os_pstat.h"
 #if defined (ACE_HAS_SYSCTL)
 # include "ace/os_include/sys/os_sysctl.h"
@@ -22,6 +21,8 @@
 # include "cpuset.h"
 #endif /* ACE_HAS_VXCPULIB */
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Basic_Array_Ptr
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int

ACE/ace/Pagefile_Memory_Pool.cpp

@@ -6,7 +6,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Category.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_sys_mman.h"
 #include "ace/OS_NS_string.h"

ACE/ace/Parse_Node.cpp

@@ -11,6 +11,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/ARGV.h"
 
+#include "ace/Auto_Ptr.h"   // ACE_Auto_Basic_Array_Ptr used
+
 #include <list>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL

ACE/ace/Parse_Node.h

@@ -21,7 +21,7 @@
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/DLL.h"
 #include "ace/SString.h"
 #include "ace/Svc_Conf.h"
@@ -222,7 +222,7 @@ class ACE_Dynamic_Node : public ACE_Static_Node
 
 private:
   /// Pointer to a descriptor that describes this node.
-  ACE_Auto_Ptr<const ACE_Service_Type_Factory> factory_;
+  std::unique_ptr<const ACE_Service_Type_Factory> factory_;
 
 private:
   ACE_Dynamic_Node (const ACE_Dynamic_Node&) = delete;
@@ -505,7 +505,7 @@ class ACE_Service_Type_Factory
 private:
   ACE_TString name_;
   int type_;
-  ACE_Auto_Ptr<ACE_Location_Node> location_;
+  std::unique_ptr<ACE_Location_Node> location_;
   bool const is_active_;
 };
 

ACE/ace/Proactor.cpp

@@ -4,7 +4,7 @@
 
 // This only works on Win32 platforms and on Unix platforms with aio
 // calls.
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Proactor_Impl.h"
 #include "ace/Object_Manager.h"
 #include "ace/Task_T.h"

ACE/ace/SOCK_SEQPACK_Acceptor.cpp

@@ -1,6 +1,6 @@
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/Log_Category.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"

ACE/ace/Service_Gestalt.cpp

@@ -5,7 +5,6 @@
 #include "ace/Service_Manager.h"
 #include "ace/Service_Types.h"
 #include "ace/Containers.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/DLL.h"
@@ -27,6 +26,8 @@
 
 #include "ace/Svc_Conf_Param.h"
 
+#include <memory>
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard
@@ -557,7 +558,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
 
   // make_service_type() is doing the dynamic loading and also runs
   // any static initializers
-  ACE_Auto_Ptr<ACE_Service_Type> tmp (stf->make_service_type (this));
+  std::unique_ptr<ACE_Service_Type> tmp (stf->make_service_type (this));
 
   if (tmp.get () != 0 &&
       this->initialize_i (tmp.get (), parameters) == 0)
@@ -914,7 +915,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[])
 #else
   ACE_DLL dll;
 
-  auto_ptr<ACE_XML_Svc_Conf> xml_svc_conf (this->get_xml_svc_conf (dll));
+  std::unique_ptr<ACE_XML_Svc_Conf> xml_svc_conf (this->get_xml_svc_conf (dll));
 
   if (xml_svc_conf.get () == 0)
     return -1;
@@ -945,8 +946,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
 #else
   ACE_DLL dll;
 
-  auto_ptr<ACE_XML_Svc_Conf>
-    xml_svc_conf (this->get_xml_svc_conf (dll));
+  std::unique_ptr<ACE_XML_Svc_Conf> xml_svc_conf (this->get_xml_svc_conf (dll));
 
   if (xml_svc_conf.get () == 0)
     return -1;

ACE/ace/Sock_Connect.cpp

@@ -2,7 +2,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/Log_Category.h"
 #include "ace/Handle_Set.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/SString.h"
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_stdio.h"
@@ -31,6 +31,8 @@
 #  include "ace/os_include/os_ifaddrs.h"
 #endif /* ACE_HAS_GETIFADDRS */
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Array_Ptr
+
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x670) && defined (__RTP__) && defined (ACE_HAS_IPV6)
 const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
 const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;

ACE/ace/TLI.cpp

@@ -6,7 +6,8 @@
 #include "ace/OS_TLI.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
-#include "ace/Auto_Ptr.h"
+
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Array_Ptr
 
 #if defined (ACE_HAS_TLI)
 
@@ -125,15 +126,15 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen)
   struct t_optmgmt req, ret;
   ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
+  std::unique_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> req_opt_buf_p (req.opt.buf);
 #  endif /* XPG5 vs XPG4 */
   struct t_opthdr *opthdr =
     reinterpret_cast<struct t_opthdr *> (req.opt.buf);
   ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
+  std::unique_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> ret_opt_buf_p (ret.opt.buf);
 #  endif /* XPG5 vs XPG4 */
@@ -190,15 +191,15 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen)
   struct t_optmgmt req, ret;
   ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr)], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
+  std::unique_ptr<char> req_opt_buf_p (reinterpret_cast<char*> (req.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> req_opt_buf_p (req.opt.buf);
 #  endif /* XPG5 vs XPG4 */
   struct t_opthdr *opthdr =
     reinterpret_cast<struct t_opthdr *> (req.opt.buf);
   ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1);
 #  if (_XOPEN_SOURCE - 0 >= 500)
-  auto_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
+  std::unique_ptr<char> ret_opt_buf_p (reinterpret_cast<char*> (ret.opt.buf));
 #  else
   ACE_Auto_Array_Ptr<char> ret_opt_buf_p (ret.opt.buf);
 #  endif /* XPG5 vs XPG4 */

ACE/ace/Thread_Manager.cpp

@@ -3,12 +3,13 @@
 #include "ace/Dynamic.h"
 #include "ace/Object_Manager.h"
 #include "ace/Singleton.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Guard_T.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Truncate.h"
 
+#include <memory>
+
 #if !defined (__ACE_INLINE__)
 #include "ace/Thread_Manager.inl"
 #endif /* __ACE_INLINE__ */
@@ -1714,7 +1715,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout,
 {
   ACE_TRACE ("ACE_Thread_Manager::wait");
 
-  ACE_Auto_Ptr<ACE_Time_Value> local_timeout;
+  std::unique_ptr<ACE_Time_Value> local_timeout;
   // Check to see if we're using absolute time or not.
   if (!use_absolute_time && timeout != 0)
     {

ACE/ace/UUID.cpp

@@ -13,6 +13,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/ACE.h"
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Array_Ptr
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils

ACE/ace/UUID.h

@@ -19,11 +19,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
 
+#include <memory>
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils
@@ -187,7 +188,7 @@ namespace ACE_Utils
 
     /// The string representation of the UUID. This is created and
     /// updated only on demand.
-    mutable ACE_Auto_Ptr <ACE_CString> as_string_;
+    mutable std::unique_ptr <ACE_CString> as_string_;
   };
 
   /**

ACE/ace/WFMO_Reactor.cpp

@@ -12,7 +12,7 @@
 #include "ace/WFMO_Reactor.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 

ACE/ace/XML_Utils/XML_Error_Handler.cpp

@@ -1,6 +1,6 @@
 #include "XML_Error_Handler.h"
 #include "ace/Log_Category.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 #include "ace/ACE.h"
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/dom/DOMLocator.hpp>

ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp

@@ -7,11 +7,12 @@
 #include "Locator_Request_Reply.inl"
 #endif
 
-#include "ace/Auto_Ptr.h"
 #include "URL_Properties.h"
 #include "URL_Array_Helper.h"
 #include "URL_Locator.h"
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Basic_Array_Ptr
+
 int
 ACE_URL_Locator_Request::url_query (const int how,
                                     const ACE_URL_Property_Seq &pseq,

ACE/apps/JAWS/clients/Caching/URL_Properties.cpp

@@ -7,9 +7,10 @@
 #include "URL_Properties.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Auto_Ptr.h"
 #include "URL_Array_Helper.h"
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Basic_Array_Ptr
+
 size_t
 ACE_WString_Helper::encode (void *buf, const ACE_WString &wstr)
 {

ACE/apps/JAWS/server/HTTP_Server.cpp

@@ -8,7 +8,7 @@
 #include "ace/LOCK_SOCK_Acceptor.h"
 #include "ace/Proactor.h"
 #include "ace/Signal.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #include "JAWS_IO.h"
 #include "HTTP_Server.h"
@@ -154,7 +154,7 @@ HTTP_Server::init (int argc, ACE_TCHAR *argv[])
   //NOTE: At this point f better not be a NULL pointer,
   //so please do not change the ACE_NEW_RETURN macros unless
   //you know what you are doing
-  ACE_Auto_Ptr<HTTP_Handler_Factory> factory (f);
+  std::unique_ptr<HTTP_Handler_Factory> factory (f);
 
   // Choose what concurrency strategy to run.
   switch (this->strategy_)

ACE/apps/JAWS/server/JAWS_IO.cpp

@@ -11,9 +11,10 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Basic_Types.h"
 
+#include "ace/Auto_Ptr.h"   // use ACE_Auto_Basic_Array_Ptr
+
 JAWS_IO::JAWS_IO (void)
   : handler_ (0)
 {

ACE/examples/APG/Active_Objects/AO.cpp

@@ -6,7 +6,7 @@
 #include "ace/Method_Request.h"
 #include "ace/Task.h"
 #include "ace/Future.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 // Listing 1 code/ch15
 class HA_ControllerAgent
 {