[Boost-commit] svn:boost r43870 - branches/release/boost/concept

From: bdawes_at_[hidden]
Date: 2008-03-26 12:59:45

Author: bemandawes
Date: 2008-03-26 12:59:45 EDT (Wed, 26 Mar 2008)
New Revision: 43870
URL: http://svn.boost.org/trac/boost/changeset/43870

Log:
Merge changeset 43861, fixing #1716
Text files modified: 
   branches/release/boost/concept/requires.hpp |     8 ++++++--                                
   1 files changed, 6 insertions(+), 2 deletions(-)

Modified: branches/release/boost/concept/requires.hpp
==============================================================================
--- branches/release/boost/concept/requires.hpp	(original)
+++ branches/release/boost/concept/requires.hpp	2008-03-26 12:59:45 EDT (Wed, 26 Mar 2008)
@@ -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 @@
 # 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)