Merge pull request #1687 from jwillemsen/jwi-autoptr5

Use std::unique_ptr and default

17 files changed, 75 insertions, 85 deletions

diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index b0af75777c3..8a37db1fdd5 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "ace/Configuration.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
@@ -17,6 +16,8 @@
 # include "ace/Malloc_Base.h"
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
+#include <memory>
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Section_Key_Internal::ACE_Section_Key_Internal ()
@@ -111,7 +112,7 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key,
 {
   // Make a copy of key
   ACE_Configuration_Section_Key current_section = key;
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> pData (path_in.rep ());
+  std::unique_ptr<ACE_TCHAR[]> pData (path_in.rep ());
   ACE_Tokenizer parser (pData.get ());
   parser.delimiter_replace ('\\', '\0');
   parser.delimiter_replace ('/', '\0');
@@ -785,7 +786,7 @@ ACE_Configuration_Win32Registry::get_string_value (const ACE_Configuration_Secti
                   ACE_TCHAR[buffer_length],
                   -1);
 
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> buffer (temp);
+  std::unique_ptr<ACE_TCHAR[]> buffer (temp);
 
   if ((errnum = ACE_TEXT_RegQueryValueEx (base_key,
                                           t_name,
@@ -878,7 +879,7 @@ ACE_Configuration_Win32Registry::get_binary_value (
 
   BYTE * the_data = 0;
   ACE_NEW_RETURN (the_data, BYTE[length], -1);
-  ACE_Auto_Basic_Array_Ptr<BYTE> safe_data (the_data);
+  std::unique_ptr<BYTE[]> safe_data (the_data);
 
   if ((errnum = ACE_TEXT_RegQueryValueEx (base_key,
                                           t_name,
@@ -1001,7 +1002,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
   ACE_NEW_RETURN (temp_path,
                   ACE_TCHAR[ACE_OS::strlen (path) + 1],
                   0);
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> pData (temp_path);
+  std::unique_ptr<ACE_TCHAR[]> pData (temp_path);
   ACE_OS::strcpy (pData.get (), path);
   ACE_Tokenizer parser (pData.get ());
   parser.delimiter_replace ('\\', '\0');
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 6afe61038f2..505b52a8ef5 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -1098,7 +1098,7 @@ ACE_INET_Addr::get_ip_address () const
   if (this->get_type () == AF_INET6)
     {
       if (IN6_IS_ADDR_V4MAPPED (&this->inet_addr_.in6_.sin6_addr) ||
-          IN6_IS_ADDR_V4COMPAT (&this->inet_addr_.in6_.sin6_addr)    )
+          IN6_IS_ADDR_V4COMPAT (&this->inet_addr_.in6_.sin6_addr))
         {
           ACE_UINT32 addr;
           // Return the last 32 bits of the address
diff --git a/ACE/ace/Local_Memory_Pool.cpp b/ACE/ace/Local_Memory_Pool.cpp
index 46a6bdbec1a..82dd4616777 100644
--- a/ACE/ace/Local_Memory_Pool.cpp
+++ b/ACE/ace/Local_Memory_Pool.cpp
@@ -1,7 +1,7 @@
 #include "ace/Local_Memory_Pool.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_Memory.h"
 #include "ace/Log_Category.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -60,7 +60,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes,
                   0);
 #endif /* ACE_HAS_ALLOC_HOOKS */
 
-  ACE_Auto_Basic_Array_Ptr<char> cp (temp);
+  std::unique_ptr<char[]> cp (temp);
 
   if (this->allocated_chunks_.insert (cp.get ()) != 0)
     ACELIB_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp
index 397ea23d6e4..27a17710d4a 100644
--- a/ACE/ace/Local_Name_Space_T.cpp
+++ b/ACE/ace/Local_Name_Space_T.cpp
@@ -8,11 +8,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Local_Name_Space.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_regex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -157,8 +157,8 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i (
       ACE_WCHAR_T *name_rep = (ACE_WCHAR_T *) (ptr + value_len);
       char *new_type = (char *) (ptr + value_len + name_len);
 
-      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
+      std::unique_ptr<ACE_WCHAR_T[]> name_urep (name.rep ());
+      std::unique_ptr<ACE_WCHAR_T[]> value_urep (value.rep ());
       ACE_NS_String new_name (name_rep, name_urep.get (), name_len);
       ACE_NS_String new_value (value_rep, value_urep.get (), value_len);
 
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index cae0e3b2c2c..a97d63e023c 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -4,7 +4,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/CDR_Stream.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Truncate.h"
 #include "ace/Log_Category.h"
 
@@ -18,6 +17,7 @@
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
 #include "ace/OS_Memory.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -389,7 +389,7 @@ operator>> (ACE_InputCDR &cdr,
 #else
     ACE_NEW_RETURN (log_msg, ACE_TCHAR[buffer_len + 1], -1);
 #endif /* ACE_HAS_ALLOC_HOOKS */
-    ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> log_msg_p (log_msg);
+    std::unique_ptr<ACE_TCHAR[]> log_msg_p (log_msg);
     log_record.type (type);
     log_record.pid (pid);
     log_record.time_stamp (ACE_Time_Value (ACE_Utils::truncate_cast<time_t> (sec),
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index b9f0fe6e6ca..edc64725a6f 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/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 <memory>
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
@@ -303,7 +304,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
 # if defined (ACE_WIN32)
 
   ACE_TCHAR *buf = 0;
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_ptr (buf);
+  std::unique_ptr<ACE_TCHAR[]> safe_ptr (buf);
   if (ACE_OS::argv_to_string (argv, buf) != -1)
     {
       PROCESS_INFORMATION process_info;
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 1456f742560..006f0e59710 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -12,6 +12,7 @@
 #include "ace/ARGV.h"
 
 #include <list>
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -647,7 +648,7 @@ ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name)
                       ACE_TCHAR[len],
                       0);
 
-      ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe (mangled_func_name);
+      std::unique_ptr<ACE_TCHAR[]> safe (mangled_func_name);
 
       ACE_OS::snprintf (mangled_func_name,
                         len,
diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h
index 7d282a38601..89217ff9dea 100644
--- a/ACE/ace/Parse_Node.h
+++ b/ACE/ace/Parse_Node.h
@@ -21,10 +21,10 @@
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
-#include "ace/Auto_Ptr.h"
 #include "ace/DLL.h"
 #include "ace/SString.h"
 #include "ace/Svc_Conf.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -222,7 +222,7 @@ public:
 
 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 @@ private:
 private:
   ACE_TString name_;
   int type_;
-  ACE_Auto_Ptr<ACE_Location_Node> location_;
+  std::unique_ptr<ACE_Location_Node> location_;
   bool const is_active_;
 };
 
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 1da8d0f8039..cc3a25d2636 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -5,7 +5,6 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/ARGV.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Signal.h"
 #include "ace/SString.h"
 #include "ace/Log_Category.h"
@@ -27,6 +26,8 @@
 # include <taskLib.h>
 #endif
 
+#include <memory>
+
 // This function acts as a signal handler for SIGCHLD. We don't really want
 // to do anything with the signal - it's just needed to interrupt a sleep.
 // See wait() for more info.
@@ -1039,7 +1040,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
   size_t const buflen = ACE_OS::strlen (variable_name) + ACE_OS::strlen (format) + 2;
   ACE_TCHAR *newformat = 0;
   ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1);
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat);
+  std::unique_ptr<ACE_TCHAR[]> safe_newformat (newformat);
 
 # if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   const ACE_TCHAR *fmt = ACE_TEXT ("%ls=%ls");
@@ -1061,7 +1062,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
 
   ACE_TCHAR *stack_buf = 0;
   ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1);
-  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_stack_buf (stack_buf);
+  std::unique_ptr<ACE_TCHAR[]> safe_stack_buf (stack_buf);
 
   do
     {
diff --git a/ACE/ace/Remote_Name_Space.cpp b/ACE/ace/Remote_Name_Space.cpp
index a2af9bbf35b..286f0911c32 100644
--- a/ACE/ace/Remote_Name_Space.cpp
+++ b/ACE/ace/Remote_Name_Space.cpp
@@ -1,8 +1,8 @@
 #include "ace/Remote_Name_Space.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Log_Category.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -42,14 +42,11 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name,
                              const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::bind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
-  ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
-  ACE_UINT32 value_len =
-    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
-  ACE_UINT32 type_len =
-    static_cast<ACE_UINT32> (ACE_OS::strlen (type));
+  std::unique_ptr<ACE_WCHAR_T[]> name_urep (name.rep ());
+  std::unique_ptr<ACE_WCHAR_T[]> value_urep (value.rep ());
+  ACE_UINT32 name_len = static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+  ACE_UINT32 value_len = static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
+  ACE_UINT32 type_len = static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::BIND,
                             name_urep.get (),
                             name_len,
@@ -66,14 +63,11 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name,
                                const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::rebind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
-  ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
-  ACE_UINT32 value_len =
-    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
-  ACE_UINT32 type_len =
-    static_cast<ACE_UINT32> (ACE_OS::strlen (type));
+  std::unique_ptr<ACE_WCHAR_T[]> name_urep (name.rep ());
+  std::unique_ptr<ACE_WCHAR_T[]> value_urep (value.rep ());
+  ACE_UINT32 name_len = static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+  ACE_UINT32 value_len = static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
+  ACE_UINT32 type_len = static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::REBIND,
                             name_urep.get (),
                             name_len,
@@ -90,9 +84,8 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
                                 char *&type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::resolve");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> name_urep (name.rep ());
+  ACE_UINT32 name_len = static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::RESOLVE,
                             name_urep.get (),
                             name_len,
@@ -125,9 +118,8 @@ int
 ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::unbind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> name_urep (name.rep ());
+  ACE_UINT32 name_len = static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::UNBIND,
                             name_urep.get (),
                             name_len,
@@ -140,9 +132,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAMES,
                             pattern_urep.get (),
                             pattern_len,
@@ -174,9 +165,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
                                     const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUES,
                             pattern_urep.get (),
                             pattern_len,
@@ -209,9 +199,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPES,
                             pattern_urep.get (),
                             pattern_len,
@@ -244,9 +233,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -285,9 +273,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
                                            const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -326,9 +313,8 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
-  ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+  std::unique_ptr<ACE_WCHAR_T[]> pattern_urep (pattern.rep ());
+  ACE_UINT32 pattern_len = static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 24ab2a8578c..202676b4ba4 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -21,11 +21,10 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
-
 #include "ace/TSS_T.h"
 #include "ace/Service_Gestalt.h"
-
 #include "ace/Svc_Conf_Param.h"
+#include <memory>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -557,7 +556,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 +913,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 +944,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::unqiue_ptr<ACE_XML_Svc_Conf> xml_svc_conf (this->get_xml_svc_conf (dll));
 
   if (xml_svc_conf.get () == 0)
     return -1;
diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp
index 7766b7e4204..72489c64a30 100644
--- a/ACE/ace/TLI.cpp
+++ b/ACE/ace/TLI.cpp
@@ -7,6 +7,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Auto_Ptr.h"
+#include <memory>
 
 #if defined (ACE_HAS_TLI)
 
@@ -125,7 +126,7 @@ 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 */
@@ -133,7 +134,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen)
     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,7 +191,7 @@ 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 */
@@ -198,7 +199,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen)
     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 */
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 0c462ad96fb..6b58fa5693e 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -3,11 +3,11 @@
 #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"
@@ -1714,7 +1714,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)
     {
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 0b424fd3528..b481c53e301 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -12,6 +12,7 @@
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/ACE.h"
+#include "ace/Auto_Ptr.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
index 3745fc25fdf..38fb413da82 100644
--- a/ACE/ace/UUID.h
+++ b/ACE/ace/UUID.h
@@ -19,10 +19,10 @@
 # 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
 
@@ -187,7 +187,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_;
   };
 
   /**
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 12e9091c26d..dc61a2a642b 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/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
 
diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp
index 86a2beef865..3a234c1d5e6 100644
--- a/ACE/ace/XML_Utils/XML_Helper.tpp
+++ b/ACE/ace/XML_Utils/XML_Helper.tpp
@@ -1,5 +1,4 @@
 #include "XML_Helper.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/Log_Category.h"
 #include "xercesc/util/XMLUniDefs.hpp"
@@ -10,6 +9,7 @@
 #include "xercesc/dom/DOM.hpp"
 #include "XercesString.h"
 #include "xercesc/dom/DOMLSSerializer.hpp"
+#include <memory>
 
 namespace XML
 {
@@ -74,7 +74,7 @@ namespace XML
     catch (const XMLException& e)
       {
         char* message = XMLString::transcode (e.getMessage());
-        ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+        std::unique_ptr<char[]> cleanup_message (message);
 
         throw;
       }
@@ -189,7 +189,7 @@ namespace XML
                                                     maxChars))
           {
             char* message = XMLString::transcode (errText);
-            ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+            std::unique_ptr<char[]> cleanup_message (message);
           }
         return 0;
 
@@ -197,7 +197,7 @@ namespace XML
     catch (const XMLException& e)
       {
         char* message = XMLString::transcode (e.getMessage());
-        ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+        std::unique_ptr<char[]> cleanup_message (message);
         throw 0;
       }
     catch (...)
@@ -237,7 +237,7 @@ namespace XML
     catch (const XMLException& e)
       {
         char* message = XMLString::transcode (e.getMessage());
-        ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+        std::unique_ptr<char[]> cleanup_message (message);
         throw;
       }
 
@@ -293,10 +293,10 @@ namespace XML
     catch (const xercesc::XMLException &e)
       {
         char* message = XMLString::transcode (e.getMessage());
-        ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+        std::unique_ptr<char[]> cleanup_message (message);
 
         char* name = XMLString::transcode (e.getType());
-        ACE_Auto_Basic_Array_Ptr<char> cleanup_name (name);
+        std::unique_ptr<char[]> cleanup_name (name);
 
         ACELIB_ERROR ((LM_ERROR, "Caught exception while serializing DOM to file.\n"
                     "Name: %C\n"