[Boost-commit] svn:boost r79617 - trunk/boost/atomic/detail

Subject: [Boost-commit] svn:boost r79617 - trunk/boost/atomic/detail
From: hcb_at_[hidden]
Date: 2012-07-20 06:51:47

Author: helge.bahmann
Date: 2012-07-20 06:51:45 EDT (Fri, 20 Jul 2012)
New Revision: 79617
URL: http://svn.boost.org/trac/boost/changeset/79617

Log:
Catch conflicting macro definitions

Compilation reportedly fails on icc, conflicting macro definitions (both
__i686__ and __x86_64__ defined) is under suspicion. This patch tentatively
fixes the issue.

Reported-by: Tim Blechmann <tim_at_[hidden]>

Text files modified: 
   trunk/boost/atomic/detail/gcc-x86.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/atomic/detail/gcc-x86.hpp
==============================================================================
--- trunk/boost/atomic/detail/gcc-x86.hpp	(original)
+++ trunk/boost/atomic/detail/gcc-x86.hpp	2012-07-20 06:51:45 EDT (Fri, 20 Jul 2012)
@@ -1510,7 +1510,7 @@
 };
 #endif
 
-#if defined(__i686__)
+#if defined(__i686__) && !defined(__x86_64__)
 
 template<typename T>
 bool
@@ -1571,7 +1571,7 @@
 }
 
 /* pull in 64-bit atomic type using cmpxchg8b above */
-#if defined(__i686__)
+#if defined(__i686__) && !defined(__x86_64__)
 #include <boost/atomic/detail/cas64strong.hpp>
 #endif