summaryrefslogtreecommitdiff
path: root/ACE/ace/Atomic_Op.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-03-11 09:35:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-03-11 09:35:25 +0000
commit5eff388808107e3e5d7bd109d2e18166ac08aab3 (patch)
treea75f5b158a83ffef2c518db343ed7722676f6eee /ACE/ace/Atomic_Op.inl
parent48d93fa13d2a970a54ce4db0bfc5879302b45c46 (diff)
downloadATCD-5eff388808107e3e5d7bd109d2e18166ac08aab3.tar.gz
Thu Mar 11 09:33:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-g++-common.h: PPU 4.1.1 for PPC doesn't have atomic builtin support for datatypes of size 1 and 2 * ace/Atomic_Op.h: * ace/Atomic_Op.inl: Added defines to just disable short/unsigned short/bool specializations * tests/run_test.lst: Enable 2610 but mark it as not fixed * ace/Process_Manager.cpp: Layout change * ace/WIN32_Asynch_IO.cpp: Const changes
Diffstat (limited to 'ACE/ace/Atomic_Op.inl')
-rw-r--r--ACE/ace/Atomic_Op.inl4
1 files changed, 4 insertions, 0 deletions
diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl
index 91ebcac9f09..fe1119947ca 100644
--- a/ACE/ace/Atomic_Op.inl
+++ b/ACE/ace/Atomic_Op.inl
@@ -466,6 +466,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs)
return *this;
}
+#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2)
ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op (void) :
ACE_Atomic_Op_GCC<short>()
@@ -517,7 +518,9 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::operator= (unsigned short rhs)
ACE_Atomic_Op_GCC<unsigned short>::operator= (rhs);
return *this;
}
+#endif
+#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1)
ACE_INLINE
ACE_Atomic_Op<ACE_Thread_Mutex, bool>::ACE_Atomic_Op (void) :
ACE_Atomic_Op_GCC<bool> ()
@@ -543,6 +546,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, bool>::operator= (bool rhs)
ACE_Atomic_Op_GCC<bool>::operator= (rhs);
return *this;
}
+#endif
#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS==1 */