diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | protocols/ace/RMCast/Acknowledge.cpp | 2 | ||||
| -rw-r--r-- | protocols/ace/RMCast/Link.cpp | 2 | ||||
| -rw-r--r-- | protocols/ace/RMCast/Retransmit.cpp | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c187dc355a2..121cfa6e6e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 31 09:58:48 2005 Boris Kolpackov <boris@kolpackov.net> + + * protocols/ace/RMCast/Acknowledge.cpp: + * protocols/ace/RMCast/Link.cpp: + * protocols/ace/RMCast/Retransmit.cpp: + + Updated to work with explicit ctor in ACE_Refcounted_Auto_Ptr. + Tue Mar 29 18:44:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Refcounted_Auto_Ptr.h: diff --git a/protocols/ace/RMCast/Acknowledge.cpp b/protocols/ace/RMCast/Acknowledge.cpp index 5fddf24bae0..0441258f337 100644 --- a/protocols/ace/RMCast/Acknowledge.cpp +++ b/protocols/ace/RMCast/Acknowledge.cpp @@ -335,7 +335,7 @@ namespace ACE_RMCast } } - if (nrtm->empty ()) return 0; + if (nrtm->empty ()) return Profile_ptr (0); else return Profile_ptr (nrtm.release ()); } diff --git a/protocols/ace/RMCast/Link.cpp b/protocols/ace/RMCast/Link.cpp index 4ea8ee7b715..0bc9e482d6e 100644 --- a/protocols/ace/RMCast/Link.cpp +++ b/protocols/ace/RMCast/Link.cpp @@ -115,7 +115,7 @@ namespace ACE_RMCast { send_ (m); send_ (hold_); - hold_ = 0; + hold_ = Message_ptr (0); } else { diff --git a/protocols/ace/RMCast/Retransmit.cpp b/protocols/ace/RMCast/Retransmit.cpp index 27b8f2cc622..ec493eeb752 100644 --- a/protocols/ace/RMCast/Retransmit.cpp +++ b/protocols/ace/RMCast/Retransmit.cpp @@ -48,7 +48,7 @@ namespace ACE_RMCast Lock l (mutex_); - queue_.bind (sn, Descr (new Data (*data))); + queue_.bind (sn, Descr (Data_ptr (new Data (*data)))); } out_->send (m); |