diff options
author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-23 17:34:00 +0000 |
---|---|---|
committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-23 17:34:00 +0000 |
commit | 7aae7595253d5fff7f41c8b250561a65acbc1930 (patch) | |
tree | 06c36681bc045cadbf233d16704bbc8077a406a0 /protocols | |
parent | 0b95127bbed5454ee9fbfda4c5c2e2b79e44e4f4 (diff) | |
download | ATCD-7aae7595253d5fff7f41c8b250561a65acbc1930.tar.gz |
ChangeLogTag: Wed Feb 23 19:48:59 2005 Boris Kolpackov <boris@kolpackov.net>
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/ace/RMCast/Bits.h | 2 | ||||
-rw-r--r-- | protocols/ace/RMCast/Link.cpp | 2 | ||||
-rw-r--r-- | protocols/ace/RMCast/Socket.cpp | 8 | ||||
-rw-r--r-- | protocols/ace/RMCast/Socket.h | 8 |
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_; }; } |