diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-22 19:14:23 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-22 19:14:23 +0000 |
| commit | 1d9e8f7b82a26aa11d572903786cee4d4a3deddb (patch) | |
| tree | d0afeb584558eaa09c1b3c5db5d55a372712e907 | |
| parent | c9e42aed6ecdedd9a573380fdfd3e9e559065fe7 (diff) | |
| download | ATCD-1d9e8f7b82a26aa11d572903786cee4d4a3deddb.tar.gz | |
ChangeLogTag:Mon Jul 22 15:13:38 2002 Carlos O'Ryan <coryan@atdesk.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/Atomic_Op.h | 3 | ||||
| -rw-r--r-- | ace/Atomic_Op.i | 6 |
4 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 647689c8db9..ddea67fbb30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 22 15:13:38 2002 Carlos O'Ryan <coryan@atdesk.com> + + * ace/Atomic_Op.h: + * ace/Atomic_Op.i: + Fixed bug 1253, add missing copy constructor. + Mon Jul 22 13:25:29 2002 Stephen Torri <storri@cs.wustl.edu> * ace/streams.h: Fixed _MSC_VER compiler warning messages stating diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 647689c8db9..ddea67fbb30 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Mon Jul 22 15:13:38 2002 Carlos O'Ryan <coryan@atdesk.com> + + * ace/Atomic_Op.h: + * ace/Atomic_Op.i: + Fixed bug 1253, add missing copy constructor. + Mon Jul 22 13:25:29 2002 Stephen Torri <storri@cs.wustl.edu> * ace/streams.h: Fixed _MSC_VER compiler warning messages stating diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h index 42e5f15ba08..53da8f91d3e 100644 --- a/ace/Atomic_Op.h +++ b/ace/Atomic_Op.h @@ -145,6 +145,9 @@ public: /// Atomically assign <rhs> to <value_>. void operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs); + /// Atomically assign <rhs> to <value_>. + void operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs); + private: /// Type of synchronization mechanism. ACE_LOCK own_mutex_; diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i index 3bcaefc0d2a..f4aa14da51d 100644 --- a/ace/Atomic_Op.i +++ b/ace/Atomic_Op.i @@ -159,6 +159,12 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> ACE_Atomic_Op_Ex <ACE_LOCK,TYPE> ::operator= (rhs); } +template <class ACE_LOCK, class TYPE> ACE_INLINE void +ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs) +{ + ACE_Atomic_Op_Ex <ACE_LOCK,TYPE> ::operator= (rhs); +} + // These specializations have been added to ACE_Atomic_Op_Ex to make the // implementation faster on Win32 that has OS support for doing this // quickly through methods like InterlockedIncrement and |