Mercurial > hg > vamp-build-and-test

comparison DEPENDENCIES/generic/include/boost/mpl/and.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
8 // (See accompanying file LICENSE_1_0.txt or copy at 8 // (See accompanying file LICENSE_1_0.txt or copy at
9 // http://www.boost.org/LICENSE_1_0.txt) 9 // http://www.boost.org/LICENSE_1_0.txt)
10 // 10 //
11 // See http://www.boost.org/libs/mpl for documentation. 11 // See http://www.boost.org/libs/mpl for documentation.
12 12
13 // $Id: and.hpp 49267 2008-10-11 06:19:02Z agurtovoy $ 13 // $Id$
14 // $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $ 14 // $Date$
15 // $Revision: 49267 $ 15 // $Revision$
16 16
17 #include <boost/mpl/aux_/config/use_preprocessed.hpp> 17 #include <boost/mpl/aux_/config/use_preprocessed.hpp>
18 18
19 #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \ 19 #if !defined(BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS) \
20 && !defined(BOOST_MPL_PREPROCESSING_MODE) 20 && !defined(BOOST_MPL_PREPROCESSING_MODE)
26 26
27 // agurt, 19/may/04: workaround a conflict with <iso646.h> header's 27 // agurt, 19/may/04: workaround a conflict with <iso646.h> header's
28 // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)' 28 // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
29 // has to be checked in a separate condition, otherwise GCC complains 29 // has to be checked in a separate condition, otherwise GCC complains
30 // about 'and' being an alternative token 30 // about 'and' being an alternative token
31 #if defined(_MSC_VER) 31 #if defined(_MSC_VER) && !defined(__clang__)
32 #ifndef __GCCXML__ 32 #ifndef __GCCXML__
33 #if defined(and) 33 #if defined(and)
34 # pragma push_macro("and") 34 # pragma push_macro("and")
35 # undef and 35 # undef and
36 # define and(x) 36 # define and(x)
39 #endif 39 #endif
40 40
41 # define BOOST_MPL_PREPROCESSED_HEADER and.hpp 41 # define BOOST_MPL_PREPROCESSED_HEADER and.hpp
42 # include <boost/mpl/aux_/include_preprocessed.hpp> 42 # include <boost/mpl/aux_/include_preprocessed.hpp>
43 43
44 #if defined(_MSC_VER) 44 #if defined(_MSC_VER) && !defined(__clang__)
45 #ifndef __GCCXML__ 45 #ifndef __GCCXML__
46 #if defined(and) 46 #if defined(and)
47 # pragma pop_macro("and") 47 # pragma pop_macro("and")
48 #endif 48 #endif
49 #endif 49 #endif