summaryrefslogtreecommitdiff
path: root/ACE/ace/CDR_Base.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-09-14 04:52:50 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-09-14 04:52:50 +0000
commitc0fa640b217abb21bd083bafeaae87285700f1a0 (patch)
treeddc7126c2322f82cd126a43381c3ee35d266295f /ACE/ace/CDR_Base.inl
parent1a45e7487eaac44158f4ac9181072f57f39034f0 (diff)
downloadATCD-c0fa640b217abb21bd083bafeaae87285700f1a0.tar.gz
Fri Sep 14 04:51:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/CDR_Base.inl')
-rw-r--r--ACE/ace/CDR_Base.inl6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl
index dd56d527144..fc991d41cd1 100644
--- a/ACE/ace/CDR_Base.inl
+++ b/ACE/ace/CDR_Base.inl
@@ -73,7 +73,7 @@ ACE_CDR::swap_2 (const char *orig, char* target)
#elif defined (ACE_HAS_BSWAP_16)
*reinterpret_cast<unsigned short *> (target) =
bswap_16 (*reinterpret_cast<unsigned short const *> (orig));
-#elif defined(ACE_HAS_INTEL_ASSEMBLY)
+#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__)
unsigned short a =
*reinterpret_cast<const unsigned short*> (orig);
asm( "rolw $8, %0" : "=r" (a) : "0" (a) );
@@ -104,7 +104,7 @@ ACE_CDR::swap_4 (const char* orig, char* target)
#elif defined (ACE_HAS_BSWAP_32)
*reinterpret_cast<unsigned int *> (target) =
bswap_32 (*reinterpret_cast<unsigned int const *> (orig));
-#elif defined(ACE_HAS_INTEL_ASSEMBLY)
+#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__)
// We have ACE_HAS_PENTIUM, so we know the sizeof's.
register unsigned int j =
*reinterpret_cast<const unsigned int*> (orig);
@@ -136,7 +136,7 @@ ACE_CDR::swap_8 (const char* orig, char* target)
#elif defined (ACE_HAS_BSWAP_64)
*reinterpret_cast<unsigned long long *> (target) =
bswap_64 (*reinterpret_cast<unsigned long long const *> (orig));
-#elif defined(ACE_HAS_INTEL_ASSEMBLY)
+#elif (defined(ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__)
register unsigned long x =
* reinterpret_cast<const unsigned long*> (orig);
asm ("bswapq %1" : "=r" (x) : "0" (x));