ChangeLogTag: Wed Feb 23 19:48:59 2005 Boris Kolpackov <boris@kolpackov.net>

4 files changed, 9 insertions, 11 deletions

diff --git a/protocols/ace/RMCast/Bits.h b/protocols/ace/RMCast/Bits.h
index 3b67da19ee2..7d9e02575d5 100644
--- a/protocols/ace/RMCast/Bits.h
+++ b/protocols/ace/RMCast/Bits.h
@@ -23,8 +23,6 @@ namespace ACE_RMCast
   typedef ACE_Guard<Mutex> Lock;
   typedef ACE_Condition<Mutex> Condition;
 
-  using ::auto_ptr; // ACE auto_ptr.
-
   // tmp
   //
   //using std::cerr;
diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp
index 43c7cf3bcce..d7c2639b5ce 100644
--- a/protocols/ace/RMCast/Link.cpp
+++ b/protocols/ace/RMCast/Link.cpp
@@ -156,7 +156,7 @@ namespace ACE_RMCast
     size_t size (0), capacity (8192);
     char* data = reinterpret_cast<char*> (operator new (capacity));
 
-    auto_ptr<char> holder (data); // This is wicked.
+    ACE_Auto_Ptr<char> holder (data); // This is wicked.
 
     while (true)
     {
diff --git a/protocols/ace/RMCast/Socket.cpp b/protocols/ace/RMCast/Socket.cpp
index 6e9a9cce1e6..b14cbc11dbf 100644
--- a/protocols/ace/RMCast/Socket.cpp
+++ b/protocols/ace/RMCast/Socket.cpp
@@ -13,10 +13,10 @@ namespace ACE_RMCast
   Socket (Address const& a, bool loop)
       : loop_ (loop), sn_ (1), cond_ (mutex_)
   {
-    acknowledge_ = auto_ptr<Acknowledge> (new Acknowledge ());
-    retransmit_ = auto_ptr<Retransmit> (new Retransmit ());
-    simulator_ = auto_ptr<Simulator> (new Simulator ());
-    link_ = auto_ptr<Link> (new Link (a));
+    acknowledge_.reset (new Acknowledge ());
+    retransmit_.reset (new Retransmit ());
+    simulator_.reset (new Simulator ());
+    link_.reset (new Link (a));
 
     // Start IN stack from top to bottom.
     //
diff --git a/protocols/ace/RMCast/Socket.h b/protocols/ace/RMCast/Socket.h
index 45c1983ec3e..092cd4af54d 100644
--- a/protocols/ace/RMCast/Socket.h
+++ b/protocols/ace/RMCast/Socket.h
@@ -55,10 +55,10 @@ namespace ACE_RMCast
 
     ACE_Unbounded_Queue<Message_ptr> queue_;
 
-    auto_ptr<Acknowledge> acknowledge_;
-    auto_ptr<Retransmit> retransmit_;
-    auto_ptr<Simulator> simulator_;
-    auto_ptr<Link> link_;
+    ACE_Auto_Ptr<Acknowledge> acknowledge_;
+    ACE_Auto_Ptr<Retransmit> retransmit_;
+    ACE_Auto_Ptr<Simulator> simulator_;
+    ACE_Auto_Ptr<Link> link_;
   };
 }