From 3870d2bf30e4ea28de58218c461b7bda1d8cb7e4 Mon Sep 17 00:00:00 2001
From: Helge Bahmann <hcb@chaoticmind.net>
Date: Fri, 20 Jul 2012 10:51:45 +0000
Subject: [PATCH] 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@klingt.org>


[SVN r79617]
---
 include/boost/atomic/detail/gcc-x86.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/atomic/detail/gcc-x86.hpp b/include/boost/atomic/detail/gcc-x86.hpp
index 15b6307..a1c9867 100644
--- a/include/boost/atomic/detail/gcc-x86.hpp
+++ b/include/boost/atomic/detail/gcc-x86.hpp
@@ -1510,7 +1510,7 @@ private:
 };
 #endif
 
-#if defined(__i686__)
+#if defined(__i686__) && !defined(__x86_64__)
 
 template<typename T>
 bool
@@ -1571,7 +1571,7 @@ platform_load64(volatile T * ptr)
 }
 
 /* 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