From 23b5e32ec6b1bea51868ee2455d73c0e4f5c342e Mon Sep 17 00:00:00 2001
From: Paul Mensonides <pmenso57@comcast.net>
Date: Thu, 26 Dec 2002 05:44:41 +0000
Subject: [PATCH] minor vc fixes

[SVN r16702]
---
 include/boost/preprocessor/logical/bitand.hpp | 7 ++++++-
 include/boost/preprocessor/logical/bitnor.hpp | 7 ++++++-
 include/boost/preprocessor/logical/bitor.hpp  | 7 ++++++-
 include/boost/preprocessor/logical/bitxor.hpp | 7 ++++++-
 include/boost/preprocessor/logical/compl.hpp  | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/include/boost/preprocessor/logical/bitand.hpp b/include/boost/preprocessor/logical/bitand.hpp
index f726791..c6eeae3 100644
--- a/include/boost/preprocessor/logical/bitand.hpp
+++ b/include/boost/preprocessor/logical/bitand.hpp
@@ -24,7 +24,12 @@
 #    define BOOST_PP_BITAND_OO(par) BOOST_PP_BITAND_I ## par
 # endif
 #
-# define BOOST_PP_BITAND_I(x, y) BOOST_PP_BITAND_ ## x ## y
+# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
+#    define BOOST_PP_BITAND_I(x, y) BOOST_PP_BITAND_ ## x ## y
+# else
+#    define BOOST_PP_BITAND_I(x, y) BOOST_PP_BITAND_ID(BOOST_PP_BITAND_ ## x ## y)
+#    define BOOST_PP_BITAND_ID(res) res
+# endif
 #
 # define BOOST_PP_BITAND_00 0
 # define BOOST_PP_BITAND_01 0
diff --git a/include/boost/preprocessor/logical/bitnor.hpp b/include/boost/preprocessor/logical/bitnor.hpp
index beeed36..6b1fce7 100644
--- a/include/boost/preprocessor/logical/bitnor.hpp
+++ b/include/boost/preprocessor/logical/bitnor.hpp
@@ -24,7 +24,12 @@
 #    define BOOST_PP_BITNOR_OO(par) BOOST_PP_BITNOR_I ## par
 # endif
 #
-# define BOOST_PP_BITNOR_I(x, y) BOOST_PP_BITNOR_ ## x ## y
+# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
+#    define BOOST_PP_BITNOR_I(x, y) BOOST_PP_BITNOR_ ## x ## y
+# else
+#    define BOOST_PP_BITNOR_I(x, y) BOOST_PP_BITNOR_ID(BOOST_PP_BITNOR_ ## x ## y)
+#    define BOOST_PP_BITNOR_ID(id) id
+# endif
 #
 # define BOOST_PP_BITNOR_00 1
 # define BOOST_PP_BITNOR_01 0
diff --git a/include/boost/preprocessor/logical/bitor.hpp b/include/boost/preprocessor/logical/bitor.hpp
index 9bd0a09..58c42fd 100644
--- a/include/boost/preprocessor/logical/bitor.hpp
+++ b/include/boost/preprocessor/logical/bitor.hpp
@@ -24,7 +24,12 @@
 #    define BOOST_PP_BITOR_OO(par) BOOST_PP_BITOR_I ## par
 # endif
 #
-# define BOOST_PP_BITOR_I(x, y) BOOST_PP_BITOR_ ## x ## y
+# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
+#    define BOOST_PP_BITOR_I(x, y) BOOST_PP_BITOR_ ## x ## y
+# else
+#    define BOOST_PP_BITOR_I(x, y) BOOST_PP_BITOR_ID(BOOST_PP_BITOR_ ## x ## y)
+#    define BOOST_PP_BITOR_ID(id) id
+# endif
 #
 # define BOOST_PP_BITOR_00 0
 # define BOOST_PP_BITOR_01 1
diff --git a/include/boost/preprocessor/logical/bitxor.hpp b/include/boost/preprocessor/logical/bitxor.hpp
index 83eea26..0a15a89 100644
--- a/include/boost/preprocessor/logical/bitxor.hpp
+++ b/include/boost/preprocessor/logical/bitxor.hpp
@@ -24,7 +24,12 @@
 #    define BOOST_PP_BITXOR_OO(par) BOOST_PP_BITXOR_I ## par
 # endif
 #
-# define BOOST_PP_BITXOR_I(x, y) BOOST_PP_BITXOR_ ## x ## y
+# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
+#    define BOOST_PP_BITXOR_I(x, y) BOOST_PP_BITXOR_ ## x ## y
+# else
+#    define BOOST_PP_BITXOR_I(x, y) BOOST_PP_BITXOR_ID(BOOST_PP_BITXOR_ ## x ## y)
+#    define BOOST_PP_BITXOR_ID(id) id
+# endif
 #
 # define BOOST_PP_BITXOR_00 0
 # define BOOST_PP_BITXOR_01 1
diff --git a/include/boost/preprocessor/logical/compl.hpp b/include/boost/preprocessor/logical/compl.hpp
index 2a8440c..acf6b87 100644
--- a/include/boost/preprocessor/logical/compl.hpp
+++ b/include/boost/preprocessor/logical/compl.hpp
@@ -24,7 +24,12 @@
 #    define BOOST_PP_COMPL_OO(par) BOOST_PP_COMPL_I ## par
 # endif
 #
-# define BOOST_PP_COMPL_I(x) BOOST_PP_COMPL_ ## x
+# if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC()
+#    define BOOST_PP_COMPL_I(x) BOOST_PP_COMPL_ ## x
+# else
+#    define BOOST_PP_COMPL_I(x) BOOST_PP_COMPL_ID(BOOST_PP_COMPL_ ## x)
+#    define BOOST_PP_COMPL_ID(id) id
+# endif
 #
 # define BOOST_PP_COMPL_0 1
 # define BOOST_PP_COMPL_1 0