diff options
| -rw-r--r-- | ace/ACE.cpp | 11 | ||||
| -rw-r--r-- | ace/Auto_Ptr.cpp | 20 | ||||
| -rw-r--r-- | ace/Auto_Ptr.h | 36 | ||||
| -rw-r--r-- | ace/Auto_Ptr.i | 86 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | ace/ReactorEx.cpp | 2 | ||||
| -rw-r--r-- | ace/Service_Config.cpp | 12 | ||||
| -rw-r--r-- | ace/Service_Object.h | 2 |
8 files changed, 86 insertions, 85 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp index a7d3d9e9c88..2ea6f16ce71 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -8,6 +8,7 @@ #include "ace/ACE.h" #include "ace/Thread_Manager.h" #include "ace/Reactor.h" +#include "ace/Auto_Ptr.h" #include "ace/INET_Addr.h" #include "ace/SString.h" #include "ace/Process.h" @@ -2096,7 +2097,7 @@ ACE::get_ip_interfaces (size_t &count, struct ifreq *ifs; ACE_NEW_RETURN (ifs, struct ifreq[num_ifs], -1); ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct ifreq)); - auto_array_ptr<struct ifreq> p_ifs (ifs); + ACE_Auto_Array_Ptr<struct ifreq> p_ifs (ifs); if (p_ifs.get() == 0) { @@ -2184,10 +2185,10 @@ ACE_Object_Manager_Destroyer::~ACE_Object_Manager_Destroyer (void) static ACE_Object_Manager_Destroyer ACE_Object_Manager_Destroyer_internal; #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class auto_array_ptr<struct ifreq>; -template class auto_basic_array_ptr<struct ifreq>; +template class ACE_Auto_Array_Ptr<struct ifreq>; +template class ACE_Auto_Basic_Array_Ptr<struct ifreq>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate auto_array_ptr<struct ifreq> -#pragma instantiate auto_basic_array_ptr<struct ifreq> +#pragma instantiate ACE_Auto_Array_Ptr<struct ifreq> +#pragma instantiate ACE_Auto_Basic_Array_Ptr<struct ifreq> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Auto_Ptr.cpp b/ace/Auto_Ptr.cpp index f5a2103e17d..0f6461280c1 100644 --- a/ace/Auto_Ptr.cpp +++ b/ace/Auto_Ptr.cpp @@ -11,36 +11,36 @@ #include "ace/Auto_Ptr.i" #endif /* __ACE_INLINE__ */ -ACE_ALLOC_HOOK_DEFINE(auto_basic_ptr) +ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Ptr) template<class X> void -auto_basic_ptr<X>::dump (void) const +ACE_Auto_Basic_Ptr<X>::dump (void) const { - ACE_TRACE ("auto_basic_ptr<X>::dump"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::dump"); } template<class X> void -auto_basic_ptr<X>::remove (X *& x) +ACE_Auto_Basic_Ptr<X>::remove (X *& x) { - ACE_TRACE ("auto_basic_ptr<X>::remove"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::remove"); X *tp = x; x = 0; delete tp; } -ACE_ALLOC_HOOK_DEFINE(auto_basic_array_ptr) +ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Array_Ptr) template<class X> void -auto_basic_array_ptr<X>::dump (void) const +ACE_Auto_Basic_Array_Ptr<X>::dump (void) const { - ACE_TRACE ("auto_basic_array_ptr<X>::dump"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::dump"); } template<class X> void -auto_basic_array_ptr<X>::remove (X *& x) +ACE_Auto_Basic_Array_Ptr<X>::remove (X *& x) { - ACE_TRACE ("auto_basic_array_ptr<X>::remove"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::remove"); X *tp = x; x = 0; diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index fd16c4bf672..6565f5a767b 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -22,17 +22,17 @@ #include "ace/ACE.h" template <class X> -class auto_basic_ptr +class ACE_Auto_Basic_Ptr // = TITLE - // Implements the draft C++ standard auto_ptr abstraction. + // Implements the draft C++ standard ACE_Auto_Ptr abstraction. // This class allows one to work on non-object (basic) types { public: // = Initialization and termination methods - auto_basic_ptr (X *p = 0); - auto_basic_ptr (auto_basic_ptr<X> &ap); - ~auto_basic_ptr (void); - void operator= (auto_basic_ptr<X> &rhs); + ACE_Auto_Basic_Ptr (X *p = 0); + ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &ap); + ~ACE_Auto_Basic_Ptr (void); + void operator= (ACE_Auto_Basic_Ptr<X> &rhs); // = Accessor methods. X &operator *() const; @@ -53,31 +53,31 @@ protected: }; template <class X> -class auto_ptr : public auto_basic_ptr <X> +class ACE_Auto_Ptr : public ACE_Auto_Basic_Ptr <X> // = TITLE - // Implements the draft C++ standard auto_ptr abstraction. + // Implements the draft C++ standard ACE_Auto_Ptr abstraction. { public: // = Initialization and termination methods - auto_ptr (X *p = 0); + ACE_Auto_Ptr (X *p = 0); X *operator-> () const; }; template<class X> -class auto_basic_array_ptr +class ACE_Auto_Basic_Array_Ptr // = TITLE - // Implements an extension to the draft C++ standard auto_ptr + // Implements an extension to the draft C++ standard ACE_Auto_Ptr // abstraction. This class allows one to work on non-object // (basic) types { public: // = Initialization and termination methods. - auto_basic_array_ptr (X *p = 0); - auto_basic_array_ptr (auto_basic_array_ptr<X> &ap); - ~auto_basic_array_ptr (void); - void operator= (auto_basic_array_ptr<X> &rhs); + ACE_Auto_Basic_Array_Ptr (X *p = 0); + ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> &ap); + ~ACE_Auto_Basic_Array_Ptr (void); + void operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs); // = Accessor methods. X &operator* (); @@ -100,14 +100,14 @@ protected: }; template<class X> -class auto_array_ptr : public auto_basic_array_ptr<X> +class ACE_Auto_Array_Ptr : public ACE_Auto_Basic_Array_Ptr<X> // = TITLE - // Implements an extension to the draft C++ standard auto_ptr + // Implements an extension to the draft C++ standard ACE_Auto_Ptr // abstraction. { public: // = Initialization and termination methods. - auto_array_ptr (X *p = 0); + ACE_Auto_Array_Ptr (X *p = 0); X *operator-> () const; }; diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i index 1ef5d6c5af3..7d8b76b9e80 100644 --- a/ace/Auto_Ptr.i +++ b/ace/Auto_Ptr.i @@ -4,162 +4,162 @@ // Auto_Ptr.i template<class X> ACE_INLINE void -auto_basic_ptr<X>::operator= (auto_basic_ptr<X> &rhs) +ACE_Auto_Basic_Ptr<X>::operator= (ACE_Auto_Basic_Ptr<X> &rhs) { - ACE_TRACE ("auto_basic_ptr<X>::operator="); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::operator="); if (this != &rhs) { - auto_basic_ptr<X>::remove (p_); + ACE_Auto_Basic_Ptr<X>::remove (p_); p_ = rhs.release (); } } template<class X> ACE_INLINE -auto_basic_ptr<X>::auto_basic_ptr (X *p) +ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (X *p) : p_ (p) { - ACE_TRACE ("auto_basic_ptr<X>::auto_basic_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr"); } template<class X> ACE_INLINE -auto_basic_ptr<X>::auto_basic_ptr (auto_basic_ptr<X> &ap) +ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &ap) : p_ (ap.release ()) { - ACE_TRACE ("auto_basic_ptr<X>::auto_basic_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr"); } template<class X> ACE_INLINE -auto_basic_ptr<X>::~auto_basic_ptr (void) +ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr (void) { - ACE_TRACE ("auto_basic_ptr<X>::~auto_basic_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr"); delete p_; } template<class X> ACE_INLINE X & -auto_basic_ptr<X>::operator *() const +ACE_Auto_Basic_Ptr<X>::operator *() const { return *p_; } template<class X> ACE_INLINE X * -auto_basic_ptr<X>::get (void) const +ACE_Auto_Basic_Ptr<X>::get (void) const { - ACE_TRACE ("auto_basic_ptr<X>::get"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::get"); return p_; } template<class X> ACE_INLINE X * -auto_basic_ptr<X>::release (void) +ACE_Auto_Basic_Ptr<X>::release (void) { - ACE_TRACE ("auto_basic_ptr<X>::release"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::release"); return this->reset (0); } template<class X> ACE_INLINE X * -auto_basic_ptr<X>::reset (X *p) +ACE_Auto_Basic_Ptr<X>::reset (X *p) { - ACE_TRACE ("auto_basic_ptr<X>::reset"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::reset"); X *tp = p_; p_ = p; return tp; } template<class X> ACE_INLINE -auto_ptr<X>::auto_ptr (X *p) - : auto_basic_ptr<X> (p) +ACE_Auto_Ptr<X>::ACE_Auto_Ptr (X *p) + : ACE_Auto_Basic_Ptr<X> (p) { - ACE_TRACE ("auto_basic_ptr<X>::auto_basic_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr"); } template<class X> ACE_INLINE X * -auto_ptr<X>::operator-> () const +ACE_Auto_Ptr<X>::operator-> () const { - ACE_TRACE ("auto_ptr<X>::operator->"); + ACE_TRACE ("ACE_Auto_Ptr<X>::operator->"); return p_; } template<class X> ACE_INLINE -auto_basic_array_ptr<X>::auto_basic_array_ptr (X *p) +ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (X *p) : p_ (p) { - ACE_TRACE ("auto_basic_array_ptr<X>::auto_basic_array_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr"); } template<class X> ACE_INLINE -auto_basic_array_ptr<X>::auto_basic_array_ptr (auto_basic_array_ptr<X> &ap) +ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> &ap) : p_ (ap.release ()) { - ACE_TRACE ("auto_basic_array_ptr<X>::auto_basic_array_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr"); } template<class X> ACE_INLINE -auto_basic_array_ptr<X>::~auto_basic_array_ptr (void) +ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr (void) { - ACE_TRACE ("auto_basic_array_ptr<X>::~auto_basic_array_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr"); delete [] p_; } template<class X> ACE_INLINE X & -auto_basic_array_ptr<X>::operator*() +ACE_Auto_Basic_Array_Ptr<X>::operator*() { return *p_; } template<class X> ACE_INLINE X & -auto_basic_array_ptr<X>::operator[](int i) +ACE_Auto_Basic_Array_Ptr<X>::operator[](int i) { return p_[i]; } template<class X> ACE_INLINE X -auto_basic_array_ptr<X>::operator[](int i) const +ACE_Auto_Basic_Array_Ptr<X>::operator[](int i) const { return p_[i]; } template<class X> ACE_INLINE X * -auto_basic_array_ptr<X>::get (void) const +ACE_Auto_Basic_Array_Ptr<X>::get (void) const { - ACE_TRACE ("auto_basic_array_ptr<X>::get"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get"); return p_; } template<class X> ACE_INLINE X * -auto_basic_array_ptr<X>::release (void) +ACE_Auto_Basic_Array_Ptr<X>::release (void) { - ACE_TRACE ("auto_basic_array_ptr<X>::release"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::release"); return this->reset (0); } template<class X> ACE_INLINE X * -auto_basic_array_ptr<X>::reset (X *p) +ACE_Auto_Basic_Array_Ptr<X>::reset (X *p) { - ACE_TRACE ("auto_basic_array_ptr<X>::reset"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::reset"); X *tp = p_; p_ = p; return tp; } template<class X> ACE_INLINE void -auto_basic_array_ptr<X>::operator= (auto_basic_array_ptr<X> &rhs) +ACE_Auto_Basic_Array_Ptr<X>::operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs) { - ACE_TRACE ("auto_basic_array_ptr<X>::operator="); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::operator="); if (this != &rhs) { - auto_basic_array_ptr<X>::remove (p_); + ACE_Auto_Basic_Array_Ptr<X>::remove (p_); p_ = rhs.release (); } } template<class X> ACE_INLINE -auto_array_ptr<X>::auto_array_ptr (X *p) - : auto_basic_array_ptr<X> (p) +ACE_Auto_Array_Ptr<X>::ACE_Auto_Array_Ptr (X *p) + : ACE_Auto_Basic_Array_Ptr<X> (p) { - ACE_TRACE ("auto_basic_array_ptr<X>::auto_basic_array_ptr"); + ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr"); } template<class X> ACE_INLINE X * -auto_array_ptr<X>::operator->() const +ACE_Auto_Array_Ptr<X>::operator->() const { return p_; } @@ -4097,7 +4097,7 @@ extern "C" ssize_t writev_timedwait (ACE_HANDLE handle, #define ACE_WIDE_STRING(ASCII_STRING) \ ACE_WString (ASCII_STRING).fast_rep () #define ACE_MULTIBYTE_STRING(WIDE_STRING) \ -auto_basic_array_ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get () +ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get () #define ACE_TEXT_STRING ACE_WString #else #define ACE_WIDE_STRING(ASCII_STRING) ASCII_STRING diff --git a/ace/ReactorEx.cpp b/ace/ReactorEx.cpp index aeb364407dd..6c2028a6690 100644 --- a/ace/ReactorEx.cpp +++ b/ace/ReactorEx.cpp @@ -822,7 +822,7 @@ ACE_ReactorEx::register_handler_i (ACE_HANDLE event_handle, long new_network_events = 0; int delete_event = 0; - auto_ptr <ACE_Auto_Event> event = 0; + ACE_Auto_Ptr <ACE_Auto_Event> event = 0; // Look up the repository to see if the <Event_Handler> is already // there. diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 8d523154a45..7f702ef1d2b 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -343,11 +343,11 @@ ACE_Service_Config::process_directives (void) ace_yyerrno = 0; ace_yylineno = 1; - // Use an auto_ptr to make sure that we release this memory + // Use an ACE_Auto_Ptr to make sure that we release this memory // regardless of how we exit... ACE_NEW_RETURN (ace_obstack, ACE_Obstack, -1); - auto_ptr<ACE_Obstack> holder (ace_obstack); + ACE_Auto_Ptr<ACE_Obstack> holder (ace_obstack); ace_yyparse (); @@ -670,15 +670,15 @@ template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>; template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>; template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>; template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >; -template class auto_ptr<ACE_Obstack>; -template class auto_basic_ptr<ACE_Obstack>; +template class ACE_Auto_Ptr<ACE_Obstack>; +template class ACE_Auto_Basic_Ptr<ACE_Obstack>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Node<ACE_Static_Svc_Descriptor *> #pragma instantiate ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *> #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *> #pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> > -#pragma instantiate auto_ptr<ACE_Obstack> -#pragma instantiate auto_basic_ptr<ACE_Obstack> +#pragma instantiate ACE_Auto_Ptr<ACE_Obstack> +#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Obstack> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Service_Object.h b/ace/Service_Object.h index ac7131b8266..65ab7fe1db3 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -94,7 +94,7 @@ class ACE_Export ACE_Service_Object_Ptr // // = DESCRIPTION // This class is similar to the Standard C++ Library class - // <auto_ptr>. It is used in conjunction with statically linked + // <ACE_Auto_Ptr>. It is used in conjunction with statically linked // <ACE_Service_Objects>, as shown in the // ./netsvcs/server/main.cpp example. { |