From 8c7f8d8a6b034a23a3dd4ea6ca0420abb0bfed2e Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Thu, 9 Nov 2006 01:14:10 +0000 Subject: [PATCH] Merge vacpp fix from RC_1_34_0 [SVN r35936] --- include/boost/mpl/has_xxx.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/boost/mpl/has_xxx.hpp b/include/boost/mpl/has_xxx.hpp index d0cb9a3..a2f9e7c 100644 --- a/include/boost/mpl/has_xxx.hpp +++ b/include/boost/mpl/has_xxx.hpp @@ -2,7 +2,7 @@ #ifndef BOOST_MPL_HAS_XXX_HPP_INCLUDED #define BOOST_MPL_HAS_XXX_HPP_INCLUDED -// Copyright Aleksey Gurtovoy 2002-2004 +// Copyright Aleksey Gurtovoy 2002-2006 // Copyright David Abrahams 2002-2003 // // Distributed under the Boost Software License, Version 1.0. @@ -144,9 +144,10 @@ template<> struct trait \ // SFINAE-based implementations below are derived from a USENET newsgroup's // posting by Rani Sharoni (comp.lang.c++.moderated, 2002-03-17 07:45:09 PST) -# elif BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) +# elif BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \ + || BOOST_WORKAROUND(__IBMCPP__, <= 700) -// MSVC 7.1+ +// MSVC 7.1+ & VACPP // agurt, 15/jun/05: replace overload-based SFINAE implementation with SFINAE // applied to partial specialization to fix some apparently random failures