Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: Future.cpp 96985 2013-04-11 15:50:32Z huangh $
#ifndef ACE_FUTURE_CPP
#define ACE_FUTURE_CPP
@ -14,11 +16,6 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Holder)
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Observer)
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Rep)
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future)
template <class T>
ACE_Future_Holder<T>::ACE_Future_Holder (void)
{
@ -195,10 +192,7 @@ ACE_Future_Rep<T>::set (const T &r,
while (iterator != end)
{
OBSERVER *observer = *iterator++;
if (observer)
{
observer->update (caller);
}
observer->update (caller);
}
// Signal all the waiting threads.