Merged changes from the RC_1_29_0 branch.

[SVN r15959]
This commit is contained in:
John Maddock
2002-10-21 11:03:05 +00:00
parent e1504cfb2e
commit 9ec9927674
6 changed files with 33 additions and 9 deletions

View File

@ -103,7 +103,7 @@
# 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.6: // last known and checked version is 5.7 (Kylix 3):
#if (__BORLANDC__ > 0x570) #if (__BORLANDC__ > 0x570)
# 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"
@ -116,3 +116,4 @@

View File

@ -7,9 +7,21 @@
// Visual Age (IBM) C++ compiler setup: // Visual Age (IBM) C++ compiler setup:
#define BOOST_NO_MEMBER_TEMPLATE_FRIENDS #if __IBMCPP__ <= 501
#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS # define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
#endif
#if (__IBMCPP__ <= 502) || !defined(BOOST_STRICT_CONFIG)
// Actually the compiler supports inclass member initialization but it
// requires a definition for the class member and it doesn't recognize
// it as an integral constant expression when used as a template argument.
# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
# define BOOST_NO_INTEGRAL_INT64_T
#endif
// //
// On AIX thread support seems to be indicated by _THREAD_SAFE: // On AIX thread support seems to be indicated by _THREAD_SAFE:
// //

View File

@ -52,7 +52,7 @@
#endif #endif
#if _MSC_VER <= 1310 #if _MSC_VER < 1310
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF
#endif #endif

View File

@ -10,12 +10,20 @@
#define BOOST_PLATFORM "IBM Aix" #define BOOST_PLATFORM "IBM Aix"
#define BOOST_HAS_UNISTD_H #define BOOST_HAS_UNISTD_H
#define BOOST_HAS_PTHREADS
#define BOOST_HAS_NL_TYPES_H #define BOOST_HAS_NL_TYPES_H
#define BOOST_HAS_NANOSLEEP
#define BOOST_HAS_CLOCK_GETTIME
// This needs support in "boost/cstdint.hpp" exactly like FreeBSD.
// This platform has header named <inttypes.h> which includes all
// the things needed.
#define BOOST_HAS_STDINT_H
// Threading API's: // Threading API's:
#define BOOST_HAS_PTHREADS
#define BOOST_HAS_PTHREAD_DELAY_NP #define BOOST_HAS_PTHREAD_DELAY_NP
#define BOOST_HAS_PTHREAD_YIELD #define BOOST_HAS_SCHED_YIELD
//#define BOOST_HAS_PTHREAD_YIELD
// boilerplate code: // boilerplate code:
#include <boost/config/posix_features.hpp> #include <boost/config/posix_features.hpp>

View File

@ -21,7 +21,7 @@
# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) // can be defined in yvals.h # if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) // 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))) # if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300))
# define BOOST_NO_STD_ALLOCATOR # define BOOST_NO_STD_ALLOCATOR
# endif # endif
# if defined(_MSC_VER) && (_MSC_VER < 1300) # if defined(_MSC_VER) && (_MSC_VER < 1300)

View File

@ -5,8 +5,11 @@
// See http://www.boost.org for most recent version. // See http://www.boost.org for most recent version.
#if __IBMCPP__ <= 501
# define BOOST_NO_STD_ALLOCATOR
#endif
#define BOOST_HAS_MACRO_USE_FACET #define BOOST_HAS_MACRO_USE_FACET
#define BOOST_NO_STD_ALLOCATOR
#define BOOST_STDLIB "Visual Age default standard library" #define BOOST_STDLIB "Visual Age default standard library"