Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/mpl/bitor.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/mpl/bitor.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/mpl/bitor.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -11,15 +11,15 @@ // // See http://www.boost.org/libs/mpl for documentation. -// $Id: bitor.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(bitor)' // has to be checked in a separate condition, otherwise GCC complains // about 'bitor' being an alternative token -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #ifndef __GCCXML__ #if defined(bitor) # pragma push_macro("bitor") @@ -34,7 +34,7 @@ #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(bitor) # pragma pop_macro("bitor")