Update HP aCC config and move header include outside namespace declarations (with thanks to Boris Gubenko for providing and testing these).

[SVN r35807]
This commit is contained in:
John Maddock
2006-11-02 10:39:11 +00:00
parent 80d7e0f31f
commit 0e93ed3c3c

View File

@ -1,8 +1,11 @@
// (C) Copyright John Maddock 2001 - 2003. // (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright Jens Maurer 2001 - 2003. // (C) Copyright Jens Maurer 2001 - 2003.
// (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright Jens Maurer 2001 - 2003.
// (C) Copyright Aleksey Gurtovoy 2002. // (C) Copyright Aleksey Gurtovoy 2002.
// (C) Copyright David Abrahams 2002 - 2003. // (C) Copyright David Abrahams 2002 - 2003.
// (C) Copyright Toon Knapen 2003. // (C) Copyright Toon Knapen 2003.
// (C) Copyright Boris Gubenko 2006.
// Use, modification and distribution are subject to the // Use, modification and distribution are subject to the
// Boost Software License, Version 1.0. (See accompanying file // Boost Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -11,6 +14,10 @@
// HP aCC C++ compiler setup: // HP aCC C++ compiler setup:
#if (__HP_aCC >= 61200) && defined(__EDG__)
#include "boost/config/compiler/common_edg.hpp"
#endif
#if (__HP_aCC <= 33100) #if (__HP_aCC <= 33100)
# define BOOST_NO_INTEGRAL_INT64_T # define BOOST_NO_INTEGRAL_INT64_T
# define BOOST_NO_OPERATORS_IN_NAMESPACE # define BOOST_NO_OPERATORS_IN_NAMESPACE
@ -27,13 +34,13 @@
# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE # define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
#endif #endif
#if (__HP_aCC <= 33900) || !defined(BOOST_STRICT_CONFIG) #if (__HP_aCC < 60000)
# define BOOST_NO_UNREACHABLE_RETURN_DETECTION # define BOOST_NO_UNREACHABLE_RETURN_DETECTION
# define BOOST_NO_TEMPLATE_TEMPLATES # define BOOST_NO_TEMPLATE_TEMPLATES
# define BOOST_NO_SWPRINTF
# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS # define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
# define BOOST_NO_IS_ABSTRACT # define BOOST_NO_IS_ABSTRACT
// std lib config should set this one already: # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
//# define BOOST_NO_STD_ALLOCATOR
#endif #endif
// optional features rather than defects: // optional features rather than defects:
@ -46,24 +53,20 @@
# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD # define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
#endif #endif
#define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#define BOOST_COMPILER "HP aCC version " BOOST_STRINGIZE(__HP_aCC) #define BOOST_COMPILER "HP aCC version " BOOST_STRINGIZE(__HP_aCC)
// //
// versions check: // 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 #if __HP_aCC < 33000
# error "Compiler not supported or configured - please reconfigure" # error "Compiler not supported or configured - please reconfigure"
#endif #endif
// //
// last known and checked version is 0: // last known and checked version is 61300:
#if (__HP_aCC > 53800) #if (__HP_aCC > 61300)
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results" # error "Unknown compiler version - please run the configure tests and report the results"
# endif # endif
#endif #endif