diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-24 05:26:41 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-24 05:26:41 +0000 |
| commit | 09951de097bea8f56ac9db6c7dab8b336cce13c2 (patch) | |
| tree | be0019dffea062fa75593c4005f5ccac8ccc1c5d | |
| parent | 4d3b49a9124f3bb643aa641f52e804be261e3ccd (diff) | |
| download | ATCD-09951de097bea8f56ac9db6c7dab8b336cce13c2.tar.gz | |
ChangeLogTag:Tue Aug 23 22:24:16 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/Atomic_Op_T.cpp | 8 | ||||
| -rw-r--r-- | ace/Atomic_Op_T.inl | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 75e9cba8ea5..bdbcf4763f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Aug 23 22:24:16 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/Atomic_Op_T.cpp: + * ace/Atomic_Op_T.inl: + + Moved inlined constructor to the ".inl" inline source file. + Tue Aug 23 22:17:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * apps/JAWS2/JAWS/JAWS.h: diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp index 7b04d7e510f..cfa7b1b316e 100644 --- a/ace/Atomic_Op_T.cpp +++ b/ace/Atomic_Op_T.cpp @@ -71,12 +71,4 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (const TYPE &c) // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op"); } -template <class ACE_LOCK, class TYPE> ACE_INLINE -ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op - (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs) - : impl_ (this->own_mutex_, rhs.value ()) -{ -// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op"); -} - #endif /* ACE_ATOMIC_OP_T_C */ diff --git a/ace/Atomic_Op_T.inl b/ace/Atomic_Op_T.inl index 6077ca4055f..4a236220741 100644 --- a/ace/Atomic_Op_T.inl +++ b/ace/Atomic_Op_T.inl @@ -156,6 +156,15 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (const TYPE &rhs) // ACE_Atomic_Op inline functions // +template <class ACE_LOCK, class TYPE> ACE_INLINE +ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op + (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs) + : impl_ (this->own_mutex_, rhs.value ()) +{ +// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op"); +} + + template <class ACE_LOCK, class TYPE> ACE_INLINE ACE_Atomic_Op<ACE_LOCK, TYPE> & ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const TYPE &i) { |