diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-26 03:21:37 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-26 03:21:37 +0000 |
| commit | 181b454defd6cc14fffbdd69249fcff1b0cdb529 (patch) | |
| tree | e6130e61c56f4fd63bb663b20889cf7f799f9fb5 /ace/Future.cpp | |
| parent | 3381b8b101dce3a0c6a81f57e1cd81a87b2037b1 (diff) | |
| download | ATCD-181b454defd6cc14fffbdd69249fcff1b0cdb529.tar.gz | |
(detach): changed equality comparison of curr_observer from itself to
the observer argument. Thanks to egcs -W for snagging this.
Diffstat (limited to 'ace/Future.cpp')
| -rw-r--r-- | ace/Future.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp index dc45f309b7d..84bed2825b9 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -1,4 +1,3 @@ -// Future.cpp // $Id$ #define ACE_BUILD_DLL @@ -39,7 +38,7 @@ ACE_Future_Rep<T>::dump (void) const if(this->value_) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NON-NULL)\n"))); else - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NULL)\n"))); ACE_DEBUG ((LM_INFO,"value_ready_: \n")); this->value_ready_.dump (); @@ -222,10 +221,10 @@ ACE_Future_Rep<T>::detach(ACE_Future_Observer<T> *observer) iter.advance ()) { OBSERVER *curr_observer = - ACE_reinterpret_cast (OBSERVER *, + ACE_reinterpret_cast (OBSERVER *, node->item_); - if (curr_observer == curr_observer) + if (curr_observer == observer) { this->observer_list_.remove (node); delete node; @@ -307,7 +306,7 @@ template <class T> int ACE_Future<T>::cancel (const T &r) { this->cancel (); - return this->future_rep_->set (r, + return this->future_rep_->set (r, *this); } |