summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-27 13:34:21 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-27 13:34:21 +0000
commit162635a50bb749d2c1eed33966a2fd42104b45d8 (patch)
tree3f832fd50953a311301fcf1b253ef69eacc2ec25
parent2d107e1d2fab4a188a424d87c16f5db7c9550819 (diff)
downloadATCD-162635a50bb749d2c1eed33966a2fd42104b45d8.tar.gz
*** empty log message ***
-rw-r--r--ace/Future.cpp6
-rw-r--r--tests/Future_Test.cpp3
2 files changed, 3 insertions, 6 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp
index 2e77d001ba4..676aeffdafd 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -182,19 +182,19 @@ ACE_Future_Rep<T>::operator T ()
template <class T>
ACE_Future<T>::ACE_Future (void)
- : future_rep_ (Future_Rep::create ())
+ : future_rep_ (FUTURE_REP::create ())
{
}
template <class T>
ACE_Future<T>::ACE_Future (const ACE_Future<T> &r)
- : future_rep_ (Future_Rep::attach (r.future_rep_))
+ : future_rep_ (FUTURE_REP::attach (r.future_rep_))
{
}
template <class T>
ACE_Future<T>::ACE_Future (const T &r)
- : future_rep_ (Future_Rep::create ())
+ : future_rep_ (FUTURE_REP::create ())
{
ACE_DEBUG ((LM_DEBUG," (%t) funny constructor\n"));
this->future_rep_->set (r);
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 338b063cb4d..4f8663a437b 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -36,15 +36,12 @@ static ATOMIC_INT task_count (0);
// a counter for the futures..
static ATOMIC_INT future_count (0);
-static ATOMIC_INT future_no (0);
// a counter for the capsules..
static ATOMIC_INT capsule_count (0);
-static ATOMIC_INT capsule_no (0);
// a counter for the method objects...
static ATOMIC_INT methodobject_count (0);
-static ATOMIC_INT methodobject_no (0);
class Scheduler : public ACE_Task<ACE_MT_SYNCH>
// = TITLE