From 03d89ec58698db5bce94740d23e0328d6107570e Mon Sep 17 00:00:00 2001 From: Mat Berchtold Date: Sat, 9 May 2020 00:53:29 -0500 Subject: [PATCH] Fixes issue https://github.com/boostorg/mpl/issues/46 --- include/boost/mpl/and.hpp | 2 +- include/boost/mpl/bitand.hpp | 2 +- include/boost/mpl/bitor.hpp | 2 +- include/boost/mpl/or.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/mpl/and.hpp b/include/boost/mpl/and.hpp index 454aaf2..5032a3b 100644 --- a/include/boost/mpl/and.hpp +++ b/include/boost/mpl/and.hpp @@ -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) && !defined(__clang__) +#if defined(_MSC_VER) #ifndef __GCCXML__ #if defined(and) # pragma push_macro("and") diff --git a/include/boost/mpl/bitand.hpp b/include/boost/mpl/bitand.hpp index 9c31c79..3d75980 100644 --- a/include/boost/mpl/bitand.hpp +++ b/include/boost/mpl/bitand.hpp @@ -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) && !defined(__clang__) +#if defined(_MSC_VER) #ifndef __GCCXML__ #if defined(bitand) # pragma push_macro("bitand") diff --git a/include/boost/mpl/bitor.hpp b/include/boost/mpl/bitor.hpp index f009743..05348c3 100644 --- a/include/boost/mpl/bitor.hpp +++ b/include/boost/mpl/bitor.hpp @@ -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) && !defined(__clang__) +#if defined(_MSC_VER) #ifndef __GCCXML__ #if defined(bitor) # pragma push_macro("bitor") diff --git a/include/boost/mpl/or.hpp b/include/boost/mpl/or.hpp index f9704d5..da290e3 100644 --- a/include/boost/mpl/or.hpp +++ b/include/boost/mpl/or.hpp @@ -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) && !defined(__clang__) +#if defined(_MSC_VER) #ifndef __GCCXML__ #if defined(or) # pragma push_macro("or")