First cut at supporting Borland's new compiler front end with dinkumware lib.

[SVN r20957]
This commit is contained in:
John Maddock
2003-11-26 12:25:35 +00:00
parent 579da92456
commit cec4768110
2 changed files with 21 additions and 21 deletions

View File

@ -1,8 +1,8 @@
// (C) Copyright John Maddock 2001 - 2003. // (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright David Abrahams 2002 - 2003. // (C) Copyright David Abrahams 2002 - 2003.
// (C) Copyright Aleksey Gurtovoy 2002. // (C) Copyright Aleksey Gurtovoy 2002.
// 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)
// See http://www.boost.org for most recent version. // See http://www.boost.org for most recent version.
@ -28,7 +28,7 @@
#endif #endif
// Version 7.0 (Kylix) and below: // Version 7.0 (Kylix) and below:
#if (__BORLANDC__ <= 0x570) || !defined(BOOST_STRICT_CONFIG) #if (__BORLANDC__ <= 0x570)
# define BOOST_NO_INTEGRAL_INT64_T # define BOOST_NO_INTEGRAL_INT64_T
# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS # define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
# define BOOST_NO_PRIVATE_IN_AGGREGATE # define BOOST_NO_PRIVATE_IN_AGGREGATE
@ -47,7 +47,7 @@
// //
// new bug in 5.61: // new bug in 5.61:
#if __BORLANDC__ >= 0x561 #if (__BORLANDC__ >= 0x561) && (__BORLANDC__ <= 0x570)
// this seems to be needed by the command line compiler, but not the IDE: // this seems to be needed by the command line compiler, but not the IDE:
# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS # define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
#endif #endif
@ -91,7 +91,7 @@
// //
// check for exception handling support: // check for exception handling support:
// //
#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) #if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS # define BOOST_NO_EXCEPTIONS
#endif #endif
// //
@ -125,8 +125,8 @@
# error "Compiler not supported or configured - please reconfigure" # error "Compiler not supported or configured - please reconfigure"
#endif #endif
// //
// last known and checked version is 5.7 (Kylix 3): // last known and checked version is 1536 (Builder X preview):
#if (__BORLANDC__ > 0x570) #if (__BORLANDC__ > 1536)
# 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"
# else # else

View File

@ -1,10 +1,10 @@
// (C) Copyright John Maddock 2001 - 2003. // (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright Jens Maurer 2001. // (C) Copyright Jens Maurer 2001.
// (C) Copyright Peter Dimov 2001. // (C) Copyright Peter Dimov 2001.
// (C) Copyright David Abrahams 2002. // (C) Copyright David Abrahams 2002.
// (C) Copyright Guillaume Melquiond 2003. // (C) Copyright Guillaume Melquiond 2003.
// 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)
// See http://www.boost.org for most recent version. // See http://www.boost.org for most recent version.
@ -22,14 +22,14 @@
#if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) #if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306)
// full dinkumware 3.06 and above // full dinkumware 3.06 and above
// fully conforming provided the compiler supports it: // fully conforming provided the compiler supports it:
# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h # if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(__BORLANDC__) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700)) // can be defined in yvals.h
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# endif # endif
# if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC) # if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC)
# define BOOST_NO_STD_ALLOCATOR # define BOOST_NO_STD_ALLOCATOR
# endif # endif
# define BOOST_HAS_PARTIAL_STD_ALLOCATOR # define BOOST_HAS_PARTIAL_STD_ALLOCATOR
# if defined(_MSC_VER) && (_MSC_VER < 1300) # if (defined(_MSC_VER) && (_MSC_VER < 1300)) && !defined(__BORLANDC__)
// if this lib version is set up for vc6 then there is no std::use_facet: // if this lib version is set up for vc6 then there is no std::use_facet:
# define BOOST_NO_STD_USE_FACET # define BOOST_NO_STD_USE_FACET
# define BOOST_HAS_TWO_ARG_USE_FACET # define BOOST_HAS_TWO_ARG_USE_FACET
@ -42,7 +42,7 @@
# if !defined(_LONGLONG) && (_CPPLIB_VER <= 310) # if !defined(_LONGLONG) && (_CPPLIB_VER <= 310)
# define BOOST_NO_MS_INT64_NUMERIC_LIMITS # define BOOST_NO_MS_INT64_NUMERIC_LIMITS
# endif # endif
// 3.06 appears to have (non-sgi versions of) <hash_set> & <hash_map>, // 3.06 appears to have (non-sgi versions of) <hash_set> & <hash_map>,
// and no <slist> at all // and no <slist> at all
#else #else
# define BOOST_MSVC_STD_ITERATOR 1 # define BOOST_MSVC_STD_ITERATOR 1
@ -62,7 +62,7 @@
#endif #endif
#if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306) #if (defined(_MSC_VER) && (_MSC_VER <= 1300) && !defined(__BORLANDC__)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306)
// if we're using a dinkum lib that's // if we're using a dinkum lib that's
// been configured for VC6/7 then there is // been configured for VC6/7 then there is
// no iterator traits (true even for icl) // no iterator traits (true even for icl)