diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-18 22:55:38 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-18 22:55:38 +0000 |
commit | 95032c1935cd24168069c2a2f45be856be544de5 (patch) | |
tree | dfbc0beb833618a8cb65e2d753c41560343f7fb2 /ace/Future.cpp | |
parent | dc7f67a19cb3b778211f4f1d2a43f3e5f151209b (diff) | |
download | ATCD-95032c1935cd24168069c2a2f45be856be544de5.tar.gz |
ChangeLogTag:Sun Jul 18 14:30:54 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'ace/Future.cpp')
-rw-r--r-- | ace/Future.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp index eb54be3b2fa..f9958779411 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -5,7 +5,7 @@ #ifndef ACE_FUTURE_CPP #define ACE_FUTURE_CPP -#include "ace/Future.h" +#include /**/ "ace/Future.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -49,7 +49,7 @@ ACE_Future_Rep<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, "ref_count_ = %d\n", - (int) this->ref_count_)); + (int) this->ref_count_)); ACE_DEBUG ((LM_INFO,"value_: \n")); if (this->value_) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (NON-NULL)\n"))); @@ -67,11 +67,7 @@ template <class T> ACE_Future_Rep<T> * ACE_Future_Rep<T>::create (void) { // Yes set ref count to zero. - ACE_Future_Rep<T> *t = 0; - ACE_NEW_RETURN (t, - ACE_Future_Rep<T>, - 0); - return t; + return new ACE_Future_Rep<T> (); } template <class T> ACE_Future_Rep<T> * @@ -160,10 +156,10 @@ ACE_Future_Rep<T>::set (const T &r, -1); // Remove and notify all subscribed observers. - ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator = + OBSERVER_COLLECTION::iterator iterator = this->observer_collection_.begin (); - ACE_TYPENAME OBSERVER_COLLECTION::iterator end = + OBSERVER_COLLECTION::iterator end = this->observer_collection_.end (); for (; @@ -273,7 +269,7 @@ ACE_Future<T>::ACE_Future (void) template <class T> ACE_Future<T>::ACE_Future (const ACE_Future<T> &r) - : future_rep_ (FUTURE_REP::attach (( (ACE_Future<T> &) r).future_rep_)) + : future_rep_ (FUTURE_REP::attach (((ACE_Future<T> &) r).future_rep_)) { } |