Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/mpl/bitand.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/mpl/bitand.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/mpl/bitand.hpp b/3rdParty/Boost/src/boost/mpl/bitand.hpp index 7292569..9c31c79 100644 --- a/3rdParty/Boost/src/boost/mpl/bitand.hpp +++ b/3rdParty/Boost/src/boost/mpl/bitand.hpp @@ -8,21 +8,21 @@ // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // // See http://www.boost.org/libs/mpl for documentation. -// $Id: bitand.hpp 63520 2010-07-02 08:59:55Z agurtovoy $ -// $Date: 2010-07-02 01:59:55 -0700 (Fri, 02 Jul 2010) $ -// $Revision: 63520 $ +// $Id$ +// $Date$ +// $Revision$ // agurt, 23/jan/10: workaround a conflict with <iso646.h> header's // macros, see http://tinyurl.com/ycwdxco; 'defined(bitand)' // has to be checked in a separate condition, otherwise GCC complains // about 'bitand' being an alternative token -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #ifndef __GCCXML__ #if defined(bitand) # pragma push_macro("bitand") # undef bitand # define bitand(x) #endif @@ -31,13 +31,13 @@ #define AUX778076_OP_NAME bitand_ #define AUX778076_OP_PREFIX bitand #define AUX778076_OP_TOKEN & #include <boost/mpl/aux_/arithmetic_op.hpp> -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #ifndef __GCCXML__ #if defined(bitand) # pragma pop_macro("bitand") #endif #endif #endif |