forked from boostorg/config
Misc Kylix fixes
[SVN r15086]
This commit is contained in:
@@ -24,13 +24,9 @@
|
|||||||
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Version 6.0 and below:
|
|
||||||
#if (__BORLANDC__ <= 0x560)
|
|
||||||
# define BOOST_NO_INTEGRAL_INT64_T
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Version 7.0 (Kylix) and below:
|
// Version 7.0 (Kylix) and below:
|
||||||
#if (__BORLANDC__ <= 0x570) || !defined(BOOST_STRICT_CONFIG)
|
#if (__BORLANDC__ <= 0x570) || !defined(BOOST_STRICT_CONFIG)
|
||||||
|
# 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
|
||||||
# define BOOST_NO_USING_TEMPLATE
|
# define BOOST_NO_USING_TEMPLATE
|
||||||
@@ -40,15 +36,31 @@
|
|||||||
// without it, this needs more investigation:
|
// without it, this needs more investigation:
|
||||||
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
||||||
|
|
||||||
|
//
|
||||||
|
// new bug in 5.61:
|
||||||
|
#if __BORLANDC__ >= 0x561
|
||||||
|
// this seems to be needed by the command line compiler, but not the IDE:
|
||||||
|
# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
|
||||||
|
#endif
|
||||||
|
|
||||||
# ifdef _WIN32
|
# ifdef _WIN32
|
||||||
# define BOOST_NO_SWPRINTF
|
# define BOOST_NO_SWPRINTF
|
||||||
# elif defined(linux)
|
# elif defined(linux) || defined(__linux__) || defined(__linux)
|
||||||
// we should really be able to do without this
|
// we should really be able to do without this
|
||||||
// but the wcs* functions aren't imported into std::
|
// but the wcs* functions aren't imported into std::
|
||||||
# define BOOST_NO_STDC_NAMESPACE
|
# define BOOST_NO_STDC_NAMESPACE
|
||||||
|
// _CPPUNWIND doesn't get automatically set for some reason:
|
||||||
|
# pragma defineonoption BOOST_CPPUNWIND -x
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//
|
||||||
|
// Post 0x561 we have long long and stdint.h:
|
||||||
|
#if __BORLANDC__ >= 0x561
|
||||||
|
# define BOOST_HAS_LONG_LONG
|
||||||
|
# define BOOST_HAS_STDINT_H
|
||||||
|
#endif
|
||||||
|
|
||||||
// Borland C++Builder 6 defaults to using STLPort. If _USE_OLD_RW_STL is
|
// Borland C++Builder 6 defaults to using STLPort. If _USE_OLD_RW_STL is
|
||||||
// defined, then we have 0x560 or greater with the Rogue Wave implementation
|
// defined, then we have 0x560 or greater with the Rogue Wave implementation
|
||||||
// which presumably has the std::DBL_MAX bug.
|
// which presumably has the std::DBL_MAX bug.
|
||||||
@@ -67,7 +79,7 @@
|
|||||||
//
|
//
|
||||||
// check for exception handling support:
|
// check for exception handling support:
|
||||||
//
|
//
|
||||||
#ifndef _CPPUNWIND
|
#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND)
|
||||||
# define BOOST_NO_EXCEPTIONS
|
# define BOOST_NO_EXCEPTIONS
|
||||||
#endif
|
#endif
|
||||||
//
|
//
|
||||||
@@ -99,3 +111,5 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user