From 54b470c9879e7793ec9a86f4b13c65ff9b436fa1 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 2 Nov 2006 10:39:11 +0000 Subject: [PATCH] Update HP aCC config and move header include outside namespace declarations (with thanks to Boris Gubenko for providing and testing these). [SVN r35807] --- include/boost/config/compiler/hp_acc.hpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp index a5de57a1..71a35363 100644 --- a/include/boost/config/compiler/hp_acc.hpp +++ b/include/boost/config/compiler/hp_acc.hpp @@ -3,6 +3,7 @@ // (C) Copyright Aleksey Gurtovoy 2002. // (C) Copyright David Abrahams 2002 - 2003. // (C) Copyright Toon Knapen 2003. +// (C) Copyright Boris Gubenko 2006. // Use, modification and distribution are subject to the // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -11,6 +12,10 @@ // HP aCC C++ compiler setup: +#if (__HP_aCC >= 61200) && defined(__EDG__) +#include "boost/config/compiler/common_edg.hpp" +#endif + #if (__HP_aCC <= 33100) # define BOOST_NO_INTEGRAL_INT64_T # define BOOST_NO_OPERATORS_IN_NAMESPACE @@ -27,16 +32,13 @@ # define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE #endif -// This version check is way to high, but we don't know the right one to use: -#if (__HP_aCC < 60700) +#if (__HP_aCC < 60000) # define BOOST_NO_UNREACHABLE_RETURN_DETECTION # define BOOST_NO_TEMPLATE_TEMPLATES # define BOOST_NO_SWPRINTF # define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS # define BOOST_NO_IS_ABSTRACT # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS -// std lib config should set this one already: -//# define BOOST_NO_STD_ALLOCATOR #endif // optional features rather than defects: @@ -53,13 +55,13 @@ // // versions check: -// we don't support HP aCC prior to version 0: +// we don't support HP aCC prior to version 33000: #if __HP_aCC < 33000 # error "Compiler not supported or configured - please reconfigure" #endif // -// last known and checked version is 0: -#if (__HP_aCC > 53800) +// last known and checked version is 61300: +#if (__HP_aCC > 61300) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # endif