From b0310d66ea09403170c2d9607cdb6caf34645e4c Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Mon, 30 Sep 2002 05:03:47 +0000
Subject: [PATCH] undo incorrect BOOST_STRICT_CONFIG changes

[SVN r15566]
---
 include/boost/config/compiler/borland.hpp    | 2 +-
 include/boost/config/compiler/comeau.hpp     | 2 +-
 include/boost/config/compiler/common_edg.hpp | 3 ++-
 include/boost/config/compiler/hp_acc.hpp     | 2 +-
 include/boost/config/compiler/intel.hpp      | 6 +++++-
 include/boost/config/compiler/kai.hpp        | 2 +-
 include/boost/config/compiler/mpw.hpp        | 2 +-
 include/boost/config/compiler/sunpro_cc.hpp  | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index e49a0a83..4d59e78e 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -25,7 +25,7 @@
 #endif
 
 // 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_PRIVATE_IN_AGGREGATE
diff --git a/include/boost/config/compiler/comeau.hpp b/include/boost/config/compiler/comeau.hpp
index 3020178f..a0e8835a 100644
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@@ -9,7 +9,7 @@
 
 #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
 #     define BOOST_NO_STDC_NAMESPACE
 #     define BOOST_NO_SWPRINTF
diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index 1f0fe32d..cb3274af 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -26,7 +26,8 @@
 #   define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
 #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
 #endif 
 
diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp
index a51b01a0..44f79c4f 100644
--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -16,7 +16,7 @@
 #  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
 #    define BOOST_NO_MEMBER_TEMPLATES
 #    define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 4db86f51..c59bb1ba 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -21,7 +21,11 @@
 #  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 #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)
 
diff --git a/include/boost/config/compiler/kai.hpp b/include/boost/config/compiler/kai.hpp
index af91946f..a7451936 100644
--- a/include/boost/config/compiler/kai.hpp
+++ b/include/boost/config/compiler/kai.hpp
@@ -9,7 +9,7 @@
 
 #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
 #     define BOOST_NO_STDC_NAMESPACE
 #   endif
diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp
index 990db443..3cd979a0 100644
--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -18,7 +18,7 @@
 //
 // 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_DEPENDENT_NESTED_DERIVATIONS
 #  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp
index bfc9be60..dab038ff 100644
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -30,7 +30,7 @@
 #      define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #    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,
        // but breaks when compiling std::less<shared_ptr<T> >
        // (Jens Maurer 4 Nov 2001).