boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-08-05 15:54:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #907

Browse Source 
[SVN r38169]
This commit is contained in:
Aleksey Gurtovoy
2007-07-09 06:41:59 +00:00
parent d970498445
commit 7518d7dab3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,21 +29,25 @@
// has to be checked in a separate condition, otherwise GCC complains // has to be checked in a separate condition, otherwise GCC complains
// about 'and' being an alternative token // about 'and' being an alternative token
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(and) #if defined(and)
# pragma push_macro("and") # pragma push_macro("and")
# undef and # undef and
# define and(x) # define and(x)
#endif #endif
#endif #endif
#endif
# define BOOST_MPL_PREPROCESSED_HEADER and.hpp # define BOOST_MPL_PREPROCESSED_HEADER and.hpp
# include <boost/mpl/aux_/include_preprocessed.hpp> # include <boost/mpl/aux_/include_preprocessed.hpp>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(and) #if defined(and)
# pragma pop_macro("and") # pragma pop_macro("and")
#endif #endif
#endif #endif
#endif
#else #else

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

@@ -30,21 +30,25 @@
// has to be checked in a separate condition, otherwise GCC complains // has to be checked in a separate condition, otherwise GCC complains
// about 'or' being an alternative token // about 'or' being an alternative token
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(or) #if defined(or)
# pragma push_macro("or") # pragma push_macro("or")
# undef or # undef or
# define or(x) # define or(x)
#endif #endif
#endif #endif
#endif
# define BOOST_MPL_PREPROCESSED_HEADER or.hpp # define BOOST_MPL_PREPROCESSED_HEADER or.hpp
# include <boost/mpl/aux_/include_preprocessed.hpp> # include <boost/mpl/aux_/include_preprocessed.hpp>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(or) #if defined(or)
# pragma pop_macro("or") # pragma pop_macro("or")
#endif #endif
#endif #endif
#endif
#else #else