Update of /cvsroot/boost/boost/boost/mpl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32033
Modified Files:
or.hpp and.hpp
Log Message:
Ticket #907
Index: or.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/mpl/or.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- or.hpp 2 Sep 2004 15:40:42 -0000 1.4
+++ or.hpp 9 Jul 2007 06:41:59 -0000 1.5
@@ -30,21 +30,25 @@
// 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 <boost/mpl/aux_/include_preprocessed.hpp>
#if defined(_MSC_VER)
+#ifndef __GCCXML__
#if defined(or)
# pragma pop_macro("or")
#endif
#endif
+#endif
#else
Index: and.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/mpl/and.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- and.hpp 2 Sep 2004 15:40:41 -0000 1.5
+++ and.hpp 9 Jul 2007 06:41:59 -0000 1.6
@@ -29,21 +29,25 @@
// 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 <boost/mpl/aux_/include_preprocessed.hpp>
#if defined(_MSC_VER)
+#ifndef __GCCXML__
#if defined(and)
# pragma pop_macro("and")
#endif
#endif
+#endif
#else
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
