boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-08-03 06:44:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

workaround a conflict with <iso646.h> macros

Browse Source 
[SVN r22870]
This commit is contained in:
Aleksey Gurtovoy
2004-05-19 14:09:47 +00:00
parent 460430a167
commit 20a6ef4d40
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/mpl/and.hpp
View File

@@ -28,9 +28,27 @@
# include "boost/mpl/aux_/void_spec.hpp"
# include "boost/mpl/aux_/lambda_support.hpp"
// agurt, 19/may/04: workaround a conflict with <iso646.h> header's
// 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
// has to be checked in a separate condition, otherwise GCC complains
// about 'or' being an alternative token
#if defined(_MSC_VER)
#if defined(and)
# pragma push_macro("and")
# undef and
# define and(x)
#endif
#endif
# define BOOST_MPL_PREPROCESSED_HEADER and.hpp
# include "boost/mpl/aux_/include_preprocessed.hpp"
#if defined(_MSC_VER)
#if defined(and)
# pragma pop_macro("and")
#endif
#endif
#else
# define AUX_LOGICAL_OP_NAME and_

18
include/boost/mpl/or.hpp
View File

@@ -28,9 +28,27 @@
# include "boost/mpl/aux_/void_spec.hpp"
# include "boost/mpl/aux_/lambda_support.hpp"
// agurt, 19/may/04: workaround a conflict with <iso646.h> header's
// 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
// has to be checked in a separate condition, otherwise GCC complains
// about 'or' being an alternative token
#if defined(_MSC_VER)
#if defined(or)
# pragma push_macro("or")
# undef or
# define or(x)
#endif
#endif
# define BOOST_MPL_PREPROCESSED_HEADER or.hpp
# include "boost/mpl/aux_/include_preprocessed.hpp"
#if defined(_MSC_VER)
#if defined(or)
# pragma pop_macro("or")
#endif
#endif
#else
# define AUX_LOGICAL_OP_NAME or_