diff options
Diffstat (limited to 'ace/Future_Set.cpp')
| -rw-r--r-- | ace/Future_Set.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp index c75bb161978..d2872a530a8 100644 --- a/ace/Future_Set.cpp +++ b/ace/Future_Set.cpp @@ -6,13 +6,13 @@ #ifndef ACE_FUTURE_SET_CPP #define ACE_FUTURE_SET_CPP -#include /**/ "ace/Future_Set.h" +#include "ace/Future_Set.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID (ace, Future_Set, "$Id$") +ACE_RCSID(ace, Future_Set, "$Id$") #if defined (ACE_HAS_THREADS) @@ -56,7 +56,7 @@ ACE_Future_Set<T>::~ACE_Future_Set (void) template <class T> int ACE_Future_Set<T>::is_empty () const { - return (((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 ); + return ( ((ACE_Future_Set<T>*)this)->future_map_.current_size () == 0 ); } template <class T> int @@ -71,9 +71,9 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future) int result = this->future_map_.bind (future_rep, future_holder); - // If a new map entry was created, then attach to the future, - // otherwise we were already attached to the future or some error - // occurred so just delete the future holder. + // If a new map entry was created, then attach to the future, otherwise + // we were already attached to the future or some error occurred so just + // delete the future holder. if ( result == 0 ) // Attach ourself to the ACE_Futures list of observer future.attach (this); @@ -87,7 +87,7 @@ template <class T> void ACE_Future_Set<T>::update (const ACE_Future<T> &future) { ACE_Message_Block *mb; - FUTURE &local_future = ACE_const_cast (ACE_Future<T> &, future); + FUTURE local_future = future; ACE_NEW (mb, ACE_Message_Block ((char *) local_future.get_rep (), 0)); @@ -103,7 +103,7 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future, if (this->is_empty ()) return 0; - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb; FUTURE_REP *future_rep = 0; // Wait for a "readable future" signal from the message queue. |