From b15e7d804bc585086aa78fe48b2772839983aab2 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Wed, 26 Mar 2008 16:59:45 +0000
Subject: [PATCH] Merge changeset 43861, fixing #1716

[SVN r43870]
---
 include/boost/concept/requires.hpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 include/boost/concept/requires.hpp

diff --git a/include/boost/concept/requires.hpp b/include/boost/concept/requires.hpp
old mode 100755
new mode 100644
index 5570b64..024ba74
--- a/include/boost/concept/requires.hpp
+++ b/include/boost/concept/requires.hpp
@@ -4,6 +4,7 @@
 #ifndef BOOST_CONCEPT_REQUIRES_DWA2006430_HPP
 # define BOOST_CONCEPT_REQUIRES_DWA2006430_HPP
 
+# include <boost/config.hpp>
 # include <boost/parameter/aux_/parenthesized_type.hpp>
 # include <boost/concept/assert.hpp>
 # include <boost/preprocessor/seq/for_each.hpp>
@@ -38,8 +39,11 @@ struct Requires_ : ::boost::parameter::aux::unaryfunptr_arg_type<Result>
 # endif 
 };
 
-
-#define BOOST_CONCEPT_REQUIRES_(r,data,t) + (::boost::_requires_<void(*)t>::value)
+# if BOOST_WORKAROUND(BOOST_INTEL_WIN, BOOST_TESTED_AT(1010))
+#  define BOOST_CONCEPT_REQUIRES_(r,data,t) | (::boost::_requires_<void(*)t>::value)
+# else 
+#  define BOOST_CONCEPT_REQUIRES_(r,data,t) + (::boost::_requires_<void(*)t>::value)
+# endif
 
 #if defined(NDEBUG) || BOOST_WORKAROUND(BOOST_MSVC, < 1300)