[Boost-commit] svn:boost r86682 - trunk/boost/mpl

Subject: [Boost-commit] svn:boost r86682 - trunk/boost/mpl
From: eldiener_at_[hidden]
Date: 2013-11-13 12:38:31

Author: eldiener
Date: 2013-11-13 12:38:31 EST (Wed, 13 Nov 2013)
New Revision: 86682
URL: http://svn.boost.org/trac/boost/changeset/86682

Log:
In clang using VC++ RTL the VC++ macros are keywords.

Text files modified: 
   trunk/boost/mpl/and.hpp    |     4 ++--                                    
   trunk/boost/mpl/bitand.hpp |     4 ++--                                    
   trunk/boost/mpl/bitor.hpp  |     4 ++--                                    
   trunk/boost/mpl/or.hpp     |     4 ++--                                    
   4 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/mpl/and.hpp
==============================================================================
--- trunk/boost/mpl/and.hpp	Wed Nov 13 12:36:15 2013	(r86681)
+++ trunk/boost/mpl/and.hpp	2013-11-13 12:38:31 EST (Wed, 13 Nov 2013)	(r86682)
@@ -28,7 +28,7 @@
 // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'and' being an alternative token
-#if defined(_MSC_VER) 
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(and) 
 #   pragma push_macro("and")
@@ -41,7 +41,7 @@
 #   define BOOST_MPL_PREPROCESSED_HEADER and.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(and) 
 #   pragma pop_macro("and")

Modified: trunk/boost/mpl/bitand.hpp
==============================================================================
--- trunk/boost/mpl/bitand.hpp	Wed Nov 13 12:36:15 2013	(r86681)
+++ trunk/boost/mpl/bitand.hpp	2013-11-13 12:38:31 EST (Wed, 13 Nov 2013)	(r86682)
@@ -19,7 +19,7 @@
 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitand)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'bitand' being an alternative token
-#if defined(_MSC_VER) 
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(bitand)
 #   pragma push_macro("bitand")
@@ -34,7 +34,7 @@
 #define AUX778076_OP_TOKEN  &
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(bitand)
 #   pragma pop_macro("bitand")

Modified: trunk/boost/mpl/bitor.hpp
==============================================================================
--- trunk/boost/mpl/bitor.hpp	Wed Nov 13 12:36:15 2013	(r86681)
+++ trunk/boost/mpl/bitor.hpp	2013-11-13 12:38:31 EST (Wed, 13 Nov 2013)	(r86682)
@@ -19,7 +19,7 @@
 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'bitor' being an alternative token
-#if defined(_MSC_VER) 
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(bitor)
 #   pragma push_macro("bitor")
@@ -34,7 +34,7 @@
 #define AUX778076_OP_TOKEN  |
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(bitor)
 #   pragma pop_macro("bitor")

Modified: trunk/boost/mpl/or.hpp
==============================================================================
--- trunk/boost/mpl/or.hpp	Wed Nov 13 12:36:15 2013	(r86681)
+++ trunk/boost/mpl/or.hpp	2013-11-13 12:38:31 EST (Wed, 13 Nov 2013)	(r86682)
@@ -29,7 +29,7 @@
 // '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(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(or)
 #   pragma push_macro("or")
@@ -42,7 +42,7 @@
 #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER) 
+#if defined(_MSC_VER) && !defined(__clang__)
 #ifndef __GCCXML__
 #if defined(or)
 #   pragma pop_macro("or")