Replaced all uses of ACE_Array_Auto_Ptr. Not even sur ewhy they were

required in the first place. Secondly, there are no tests to test this 
out. Thirdly, we don't even know whether anyone is using this.

2 files changed, 37 insertions, 23 deletions

diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp
index cfe9c762e12..24d0fdadfe2 100644
--- a/ACE/ace/Local_Name_Space_T.cpp
+++ b/ACE/ace/Local_Name_Space_T.cpp
@@ -10,12 +10,12 @@
 #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"
 
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ALLOCATOR>
@@ -159,10 +159,13 @@ 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> name_urep (name.rep ());
       ACE_Auto_Basic_Array_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);
+      **/
+
+      ACE_NS_String new_name (name_rep, name.fast_rep(), name_len);
+      ACE_NS_String new_value (value_rep, value.fast_rep (), value_len);
 
       ACE_OS::strcpy (new_type, type);
       ACE_NS_Internal new_internal (new_value, new_type);
diff --git a/ACE/ace/Remote_Name_Space.cpp b/ACE/ace/Remote_Name_Space.cpp
index 43fb8db9b19..0ccac66dac5 100644
--- a/ACE/ace/Remote_Name_Space.cpp
+++ b/ACE/ace/Remote_Name_Space.cpp
@@ -1,5 +1,4 @@
 #include "ace/Remote_Name_Space.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
@@ -46,8 +45,10 @@ 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 =
@@ -55,9 +56,9 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name,
   ACE_UINT32 type_len =
     static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::BIND,
-                            name_urep.get (),
+                            name.fast_rep (),
                             name_len,
-                            value_urep.get (),
+                            value.fast_rep (),
                             value_len,
                             type,
                             type_len);
@@ -70,8 +71,10 @@ 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_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 =
@@ -79,9 +82,9 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name,
   ACE_UINT32 type_len =
     static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::REBIND,
-                            name_urep.get (),
+                            name.fast_rep (),
                             name_len,
-                            value_urep.get (),
+                            value.fast_rep (),
                             value_len,
                             type,
                             type_len);
@@ -94,11 +97,13 @@ 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));
   ACE_Name_Request request (ACE_Name_Request::RESOLVE,
-                            name_urep.get (),
+                            name.fast_rep (),
                             name_len,
                             0, 0, 0, 0);
 
@@ -123,11 +128,13 @@ 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));
   ACE_Name_Request request (ACE_Name_Request::UNBIND,
-                            name_urep.get (),
+                            name.fast_rep (),
                             name_len,
                             0, 0, 0, 0);
   return this->ns_proxy_.request_reply (request);
@@ -138,11 +145,13 @@ 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));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAMES,
-                            pattern_urep.get (),
+                            pattern.fast_rep (),
                             pattern_len,
                             0, 0, 0, 0);
   if (this->ns_proxy_.send_request (request) == -1)
@@ -172,11 +181,13 @@ 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));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUES,
-                            pattern_urep.get (),
+                            pattern.fast_rep (),
                             pattern_len,
                             0, 0, 0, 0);
   if (this->ns_proxy_.send_request (request) == -1)
@@ -207,11 +218,11 @@ 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_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));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPES,
-                            pattern_urep.get (),
+                            pattern.fast_rep (),
                             pattern_len,
                             0, 0, 0, 0);
 
@@ -242,11 +253,11 @@ 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_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));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
-                            pattern_urep.get (),
+                            pattern.fast_rep(), 
                             pattern_len,
                             0, 0, 0, 0);
 
@@ -283,11 +294,11 @@ 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_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));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
-                            pattern_urep.get (),
+                            pattern.fast_rep (),
                             pattern_len,
                             0, 0, 0, 0);
 
@@ -324,11 +335,11 @@ 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_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));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
-                            pattern_urep.get (),
+                            pattern.fast_rep (),
                             pattern_len,
                             0, 0, 0, 0);