Mercurial > hg > vamp-build-and-test

comparison DEPENDENCIES/generic/include/boost/mpl/bitor.hpp @ 101:c530137014c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
comparison
equal deleted inserted replaced
100:793467b5e61c 101:c530137014c0
9 // (See accompanying file LICENSE_1_0.txt or copy at 9 // (See accompanying file LICENSE_1_0.txt or copy at
10 // http://www.boost.org/LICENSE_1_0.txt) 10 // http://www.boost.org/LICENSE_1_0.txt)
11 // 11 //
12 // See http://www.boost.org/libs/mpl for documentation. 12 // See http://www.boost.org/libs/mpl for documentation.
13 13
14 // $Id: bitor.hpp 63520 2010-07-02 08:59:55Z agurtovoy $ 14 // $Id$
15 // $Date: 2010-07-02 01:59:55 -0700 (Fri, 02 Jul 2010) $ 15 // $Date$
16 // $Revision: 63520 $ 16 // $Revision$
17 17
18 // agurt, 23/jan/10: workaround a conflict with <iso646.h> header's 18 // agurt, 23/jan/10: workaround a conflict with <iso646.h> header's
19 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)' 19 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)'
20 // has to be checked in a separate condition, otherwise GCC complains 20 // has to be checked in a separate condition, otherwise GCC complains
21 // about 'bitor' being an alternative token 21 // about 'bitor' being an alternative token
22 #if defined(_MSC_VER) 22 #if defined(_MSC_VER) && !defined(__clang__)
23 #ifndef __GCCXML__ 23 #ifndef __GCCXML__
24 #if defined(bitor) 24 #if defined(bitor)
25 # pragma push_macro("bitor") 25 # pragma push_macro("bitor")
26 # undef bitor 26 # undef bitor
27 # define bitor(x) 27 # define bitor(x)
32 #define AUX778076_OP_NAME bitor_ 32 #define AUX778076_OP_NAME bitor_
33 #define AUX778076_OP_PREFIX bitor 33 #define AUX778076_OP_PREFIX bitor
34 #define AUX778076_OP_TOKEN | 34 #define AUX778076_OP_TOKEN |
35 #include <boost/mpl/aux_/arithmetic_op.hpp> 35 #include <boost/mpl/aux_/arithmetic_op.hpp>
36 36
37 #if defined(_MSC_VER) 37 #if defined(_MSC_VER) && !defined(__clang__)
38 #ifndef __GCCXML__ 38 #ifndef __GCCXML__
39 #if defined(bitor) 39 #if defined(bitor)
40 # pragma pop_macro("bitor") 40 # pragma pop_macro("bitor")
41 #endif 41 #endif
42 #endif 42 #endif