boost/atomic
2
0
Fork 0
mirror of https://github.com/boostorg/atomic.git synced 2026-01-29 19:32:08 +00:00
Code Issues Projects Releases Wiki Activity

Catch conflicting macro definitions

Browse Source 
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]
This commit is contained in:
Helge Bahmann
2012-07-20 10:51:45 +00:00
parent 3d15020971
commit 3870d2bf30
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/atomic/detail/gcc-x86.hpp
View File

@@ -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