undo incorrect BOOST_STRICT_CONFIG changes

[SVN r15566]
This commit is contained in:
Aleksey Gurtovoy
2002-09-30 05:03:47 +00:00
parent 397e88754d
commit b0310d66ea
8 changed files with 13 additions and 8 deletions

View File

@ -25,7 +25,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) || !defined(BOOST_STRICT_CONFIG)
# 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

View File

@ -9,7 +9,7 @@
#include "boost/config/compiler/common_edg.hpp" #include "boost/config/compiler/common_edg.hpp"
#if (__COMO_VERSION__ <= 4245) && !defined(BOOST_STRICT_CONFIG) #if (__COMO_VERSION__ <= 4245) || !defined(BOOST_STRICT_CONFIG)
# if defined(_MSC_VER) && _MSC_VER <= 1300 # if defined(_MSC_VER) && _MSC_VER <= 1300
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF

View File

@ -26,7 +26,8 @@
# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP # define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
#endif #endif
#if (__EDG_VERSION__ <= 245) && !defined(BOOST_NO_TEMPLATE_TEMPLATES) #if (__EDG_VERSION__ <= 244) && !defined(BOOST_NO_TEMPLATE_TEMPLATES) \
&& !defined(BOOST_STRICT_CONFIG)
# define BOOST_NO_TEMPLATE_TEMPLATES # define BOOST_NO_TEMPLATE_TEMPLATES
#endif #endif

View File

@ -16,7 +16,7 @@
# endif # endif
#endif #endif
#if (__HP_aCC <= 33300) && !defined(BOOST_STRICT_CONFIG) #if (__HP_aCC <= 33300) || !defined(BOOST_STRICT_CONFIG)
// member templates are sufficiently broken that we disable them for now // member templates are sufficiently broken that we disable them for now
# define BOOST_NO_MEMBER_TEMPLATES # define BOOST_NO_MEMBER_TEMPLATES
# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS # define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS

View File

@ -21,7 +21,11 @@
# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS # define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
#endif #endif
#if (BOOST_INTEL_CXX_VERSION <= 600) && !defined(BOOST_STRICT_CONFIG) #if (BOOST_INTEL_CXX_VERSION <= 500) && !defined(BOOST_STRICT_CONFIG)
# define BOOST_NO_TEMPLATE_TEMPLATES
#endif
#if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG)
# if defined(_MSC_VER) && (_MSC_VER <= 1300) // added check for <= VC 7 (Peter Dimov) # if defined(_MSC_VER) && (_MSC_VER <= 1300) // added check for <= VC 7 (Peter Dimov)

View File

@ -9,7 +9,7 @@
#include "boost/config/compiler/common_edg.hpp" #include "boost/config/compiler/common_edg.hpp"
# if (__KCC_VERSION <= 4001) && !defined(BOOST_STRICT_CONFIG) # if (__KCC_VERSION <= 4001) || !defined(BOOST_STRICT_CONFIG)
// at least on Sun, the contents of <cwchar> is not in namespace std // at least on Sun, the contents of <cwchar> is not in namespace std
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# endif # endif

View File

@ -18,7 +18,7 @@
// //
// MPW 8.90: // MPW 8.90:
// //
#if (MPW_CPLUS <= 0x890) && !defined(BOOST_STRICT_CONFIG) #if (MPW_CPLUS <= 0x890) || !defined(BOOST_STRICT_CONFIG)
# define BOOST_NO_CV_SPECIALIZATIONS # define BOOST_NO_CV_SPECIALIZATIONS
# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS # define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS # define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS

View File

@ -30,7 +30,7 @@
# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION # define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
# endif # endif
# if (__SUNPRO_CC <= 0x530) && !defined(BOOST_STRICT_CONFIG) # if (__SUNPRO_CC <= 0x530) || !defined(BOOST_STRICT_CONFIG)
// SunPro 5.3 has better support for partial specialization, // SunPro 5.3 has better support for partial specialization,
// but breaks when compiling std::less<shared_ptr<T> > // but breaks when compiling std::less<shared_ptr<T> >
// (Jens Maurer 4 Nov 2001). // (Jens Maurer 4 Nov 2001).