summaryrefslogtreecommitdiff
path: root/ace/Future.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-12-03 15:20:36 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-12-03 15:20:36 +0000
commit2d2e715e9b4d48ad8bb6593223feb8f536c263a5 (patch)
treeae4b6e80056fe019c2f10b579cd935cdaaf1c7c4 /ace/Future.cpp
parent3338bb2053813dd4a32801ae57c8bb03574d4b0c (diff)
downloadATCD-2d2e715e9b4d48ad8bb6593223feb8f536c263a5.tar.gz
moved ACE_Atomic_Op<ACE_Thread_Mutex, int> instantiation from ace/Future.cpp to where it is used
Diffstat (limited to 'ace/Future.cpp')
-rw-r--r--ace/Future.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp
index 75eee48a85f..0b269abd850 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -282,7 +282,7 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs)
// This will work if &r == this, by first increasing the ref count
ACE_Future<T> &r = ( ACE_Future<T> &) rhs;
FUTURE_REP::assign (this->future_rep_,
- FUTURE_REP::attach (r.future_rep_));
+ FUTURE_REP::attach (r.future_rep_));
}
template <class T> void
@@ -311,16 +311,5 @@ ACE_Future<T>::operator &()
{
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// This should probably be moved elsewhere now that ACE_Atomic_Op<>
-// isn't used.
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// This should probably be moved elsewhere now that ACE_Atomic_Op<>
-// isn't used.
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
#endif /* ACE_HAS_THREADS */
#endif /* ACE_FUTURE_CPP */