diff options
| author | Steve Huston <shuston@riverace.com> | 2022-03-29 20:42:46 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2022-03-29 20:42:46 +0000 |
| commit | 5ad3baf4683a086f638c9dca913e067a0389a301 (patch) | |
| tree | a755a564a0336544a44fac945154e14d8d116e05 | |
| parent | 971966d3addbf08c1f73fb845c088ca4201f64db (diff) | |
| parent | ece0061273a7bf1118728923a041f6c4111fe65a (diff) | |
| download | ATCD-5ad3baf4683a086f638c9dca913e067a0389a301.tar.gz | |
Merge Atomic_Op and makeinclude changes from branch 'Riverace-6.2a' into Riverace-6.2
| -rw-r--r-- | ACE/ace/Atomic_Op.h | 1 | ||||
| -rw-r--r-- | ACE/ace/Atomic_Op.inl | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.local.GNU | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index 60e72fd4f29..810a04b0933 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -310,6 +310,7 @@ public: ACE_Atomic_Op (unsigned long c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c); ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (unsigned long rhs); + ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c); }; // The long long intrinsics are not available on PPC diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index c12e7a23366..fb0eaadc746 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -236,6 +236,14 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op ( { } +ACE_INLINE +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>& operator= ( + const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &rhs) +{ + value_ = rhs.value_; + return *this; +} + ACE_INLINE unsigned long ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator++ (void) { diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 09b58f41627..6f53fc33268 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -149,7 +149,7 @@ RC_OUTPUT_FLAG ?= ifneq (,$(COMPILE.rc)) $(VDIR)%.rc.o: %.rc $(mk_obj_out_dir) - $(COMPILE.rc) $(RC_OUTPUT_FLAG) $@ $< + $(COMPILE.rc) $(RC_OUTPUT_FLAG) $@ $(abspath $<) ${MVCMD} endif # COMPILE.rc |