To avoid a compilation error under GCCXML running on WIndows, the following changes were made to a local copy:

Index: and.hpp =================================================================== RCS file: C:\CVS/boost/boost/mpl/and.hpp,v retrieving revision 1.1 diff -d -u -r1.1 and.hpp --- and.hpp 12 Apr 2007 14:55:22 -0000 1.1 +++ and.hpp 12 Apr 2007 15:01:06 -0000 @@ -29,19 +29,23 @@ // has to be checked in a separate condition, otherwise GCC complains // about 'and' being an alternative token #if defined(_MSC_VER) +#ifndef __GCCXML__ #if defined(and) # pragma push_macro("and") # undef and # define and(x) #endif #endif +#endif

# define BOOST_MPL_PREPROCESSED_HEADER and.hpp # include

#if defined(_MSC_VER) +#ifndef __GCCXML__ #if defined(and) # pragma pop_macro("and") +#endif #endif #endif

Index: or.hpp =================================================================== RCS file: C:\CVS/boost/boost/mpl/or.hpp,v retrieving revision 1.1 diff -d -u -r1.1 or.hpp --- or.hpp 12 Apr 2007 14:55:22 -0000 1.1 +++ or.hpp 12 Apr 2007 15:00:27 -0000 @@ -30,19 +30,23 @@ // has to be checked in a separate condition, otherwise GCC complains // about 'or' being an alternative token #if defined(_MSC_VER) +#ifndef __GCCXML__ #if defined(or) # pragma push_macro("or") # undef or # define or(x) #endif #endif +#endif

# define BOOST_MPL_PREPROCESSED_HEADER or.hpp # include

#if defined(_MSC_VER) +#ifndef __GCCXML__ #if defined(or) # pragma pop_macro("or") +#endif #endif #endif