mirror of
https://github.com/boostorg/mpl.git
synced 2025-08-07 00:34:34 +02:00
Merge outdated aCC6 workarounds fix from RC_1_34_0
[SVN r35927]
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
// Copyright Aleksey Gurtovoy 2000-2004
|
// Copyright Aleksey Gurtovoy 2000-2006
|
||||||
//
|
//
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (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;
|
typedef AUX_WRAPPER_INST(prior_value) prior;
|
||||||
#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
|
#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
|
||||||
|| BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \
|
|| 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)) ) next;
|
||||||
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)) ) prior;
|
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)) ) prior;
|
||||||
#else
|
#else
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
#ifndef BOOST_MPL_INTEGRAL_C_HPP_INCLUDED
|
#ifndef BOOST_MPL_INTEGRAL_C_HPP_INCLUDED
|
||||||
#define 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.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
#include <boost/mpl/aux_/config/static_constant.hpp>
|
#include <boost/mpl/aux_/config/static_constant.hpp>
|
||||||
#include <boost/mpl/aux_/config/workaround.hpp>
|
#include <boost/mpl/aux_/config/workaround.hpp>
|
||||||
|
|
||||||
#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
|
// the type of non-type template arguments may not depend on template arguments
|
||||||
# define AUX_WRAPPER_PARAMS(N) typename T, long N
|
# define AUX_WRAPPER_PARAMS(N) typename T, long N
|
||||||
#else
|
#else
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
#ifndef BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED
|
#ifndef BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED
|
||||||
#define 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.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
|
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
|
// the type of non-type template arguments may not depend on template arguments
|
||||||
template< typename T, long N > struct integral_c;
|
template< typename T, long N > struct integral_c;
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user