From 335631321f630716a13bf4bbbb27bdd145f1daab Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Wed, 8 Nov 2006 21:48:32 +0000 Subject: [PATCH] Merge outdated aCC6 workarounds fix from RC_1_34_0 [SVN r35927] --- include/boost/mpl/aux_/integral_wrapper.hpp | 4 ++-- include/boost/mpl/integral_c.hpp | 4 ++-- include/boost/mpl/integral_c_fwd.hpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/mpl/aux_/integral_wrapper.hpp b/include/boost/mpl/aux_/integral_wrapper.hpp index fb38162..dc2cfc8 100644 --- a/include/boost/mpl/aux_/integral_wrapper.hpp +++ b/include/boost/mpl/aux_/integral_wrapper.hpp @@ -1,5 +1,5 @@ -// Copyright Aleksey Gurtovoy 2000-2004 +// Copyright Aleksey Gurtovoy 2000-2006 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -65,7 +65,7 @@ struct AUX_WRAPPER_NAME typedef AUX_WRAPPER_INST(prior_value) prior; #elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \ - || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(53800)) + || BOOST_WORKAROUND(__HP_aCC, <= 53800) typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)) ) next; typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)) ) prior; #else diff --git a/include/boost/mpl/integral_c.hpp b/include/boost/mpl/integral_c.hpp index d7abd12..5da979f 100644 --- a/include/boost/mpl/integral_c.hpp +++ b/include/boost/mpl/integral_c.hpp @@ -2,7 +2,7 @@ #ifndef BOOST_MPL_INTEGRAL_C_HPP_INCLUDED #define BOOST_MPL_INTEGRAL_C_HPP_INCLUDED -// Copyright Aleksey Gurtovoy 2000-2004 +// Copyright Aleksey Gurtovoy 2000-2006 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -19,7 +19,7 @@ #include #include -#if BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(53800)) +#if BOOST_WORKAROUND(__HP_aCC, <= 53800) // the type of non-type template arguments may not depend on template arguments # define AUX_WRAPPER_PARAMS(N) typename T, long N #else diff --git a/include/boost/mpl/integral_c_fwd.hpp b/include/boost/mpl/integral_c_fwd.hpp index 38146c3..1fb350a 100644 --- a/include/boost/mpl/integral_c_fwd.hpp +++ b/include/boost/mpl/integral_c_fwd.hpp @@ -2,7 +2,7 @@ #ifndef BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED #define BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED -// Copyright Aleksey Gurtovoy 2000-2004 +// Copyright Aleksey Gurtovoy 2000-2006 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -19,7 +19,7 @@ BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN -#if BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(53800)) +#if BOOST_WORKAROUND(__HP_aCC, <= 53800) // the type of non-type template arguments may not depend on template arguments template< typename T, long N > struct integral_c; #else