First round of config fixes

[SVN r11146]
2001-09-19 11:48:51 +00:00
parent 3b890c53ab
commit 7ce333aa88
9 changed files with 44 additions and 36 deletions
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@ -13,6 +13,8 @@
 #  define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
 #  if defined(_MSC_VER) && _MSC_VER <= 1200
 #     define BOOST_NO_STDC_NAMESPACE
+#     define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+#     define BOOST_NO_SWPRINTF
 #  endif
 #endif

--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@ -17,14 +17,20 @@
 #  define BOOST_INTEL_CXX_VERSION __ICC
 #endif

-#if BOOST_INTEL_CXX_VERSION <= 600
-#  define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
-   // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup 
-   // in the frontend even in "strict" mode.  (reported by Kirk Klobe) 
-   // Intel C++ 6.0 (currently in Beta test) doesn't have any front-end 
-   // changes at all.  (reported by Kirk Klobe) 
-#  ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-#     define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+#if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG)
+//#  define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
+
+#  if defined(_MSC_VER)
+      // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup
+      // in the frontend even in "strict" mode.  (reported by Kirk Klobe)
+      // Intel C++ 6.0 (currently in Beta test) doesn't have any front-end
+      // changes at all.  (reported by Kirk Klobe)
+#     ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+#        define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+#     endif
+#     define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
+#     define BOOST_NO_SWPRINTF
+#     define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 #  endif

 #endif
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@ -15,7 +15,7 @@
 #   endif

 #   if __MWERKS__ <= 0x2401  // 6.2
-#     define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
+//#     define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 #   endif

 #   if(__MWERKS__ <= 0x2405) || !defined(BOOST_STRICT_CONFIG)  // 7
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@ -36,7 +36,7 @@
 #  define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 #  define BOOST_NO_USING_TEMPLATE
 #  define BOOST_NO_SWPRINTF
-#  define BOOST_NO_POINTER_TO_MEMBER_CONST
+//#  define BOOST_NO_POINTER_TO_MEMBER_CONST
   //
   // disable man/max macros if defined:
   //
--- a/include/boost/config/select_compiler_config.hpp
+++ b/include/boost/config/select_compiler_config.hpp
@ -12,62 +12,62 @@

 #if defined __GNUC__
 //  GNU C++:
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/gcc.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"

 #elif defined __KCC
 //  Kai C++
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/kai.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/kai.hpp"

 #elif defined __sgi
 //  SGI MIPSpro C++
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/sgi_mipspro.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp"

 #elif defined __DECCXX
 //  Compaq Tru64 Unix cxx
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/compaq_cxx.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp"

 #elif defined __ghs
 //  Greenhills C++
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/greenhills.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"

 #elif defined __BORLANDC__
 //  Borland
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/borland.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"

 #elif defined(__ICL) || defined(__ICC)
 //  Intel
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/intel.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"

 #elif defined  __MWERKS__
 //  Metrowerks CodeWarrior
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/metrowerks.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"

 #elif defined  __SUNPRO_CC
 //  Sun Workshop Compiler C++
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/sunpro_cc.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp"

 #elif defined __HP_aCC
 //  HP aCC
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/hp_acc.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/hp_acc.hpp"

 #elif defined(__MRC__) || defined(__SC__)
 //  MPW MrCpp or SCpp
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/mpw.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/mpw.hpp"

 #elif defined(__IBMCPP__)
 //  IBM Visual Age
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/vacpp.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp"

 # elif defined __COMO__
 //  Comeau C++
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/comeau.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"

 #elif defined _MSC_VER
 //  Microsoft Visual C++
 //
 //  Must remain the last #elif since some other vendors (Metrowerks, for
 //  example) also #define _MSC_VER
-#   define BOOST_COMPILER_CONFIG <boost/config/compiler/visualc.hpp>
+#   define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp"

 #elif defined (BOOST_ASSERT_CONFIG)
 // this must come last - generate an error if we don't
--- a/include/boost/config/select_stdlib_config.hpp
+++ b/include/boost/config/select_stdlib_config.hpp
@ -21,31 +21,31 @@
 // STLPort library; this _must_ come first, otherwise since
 // STLport typically sits on top of some other library, we
 // can end up detecting that first rather than STLport:
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/stlport.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/stlport.hpp"

 #elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
 // Rogue Wave library:
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/roguewave.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/roguewave.hpp"

 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
 // Dinkumware Library:
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/dinkumware.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"

 #elif defined(__GLIBCPP__)
 // GNU libstdc++ 3
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/libstdcpp3.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp"

 #elif defined(__STL_CONFIG_H)
 // generic SGI STL
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/sgi.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp"

 #elif defined(__MSL_CPP__)
 // MSL standard lib:
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/msl.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp"

 #  elif defined(__IBMCPP__)
 // take the default VACPP std lib
-#  define BOOST_STDLIB_CONFIG <boost/config/stdlib/vacpp.hpp>
+#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp"

 #elif defined (BOOST_ASSERT_CONFIG)
 // this must come last - generate an error if we don't
--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@ -29,9 +29,7 @@

 #if defined(__MSL__) && (__MSL__ >= 0x5000)
 #  define BOOST_HAS_STDINT_H
-#  if defined(macintosh)
-#     define BOOST_HAS_UNISTD_H
-#  endif
+#  define BOOST_HAS_UNISTD_H
 #endif


--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@ -37,7 +37,7 @@
 // Assume no std::locale without own iostreams (this may be an
 // incorrect assumption in some cases):
 //
-#ifndef __SGI_STL_OWN_IOSTREAMS
+#if !defined(__SGI_STL_OWN_IOSTREAMS) && !defined(__STL_USE_NEW_IOSTREAMS)
 #  define BOOST_NO_STD_LOCALE
 #endif

--- a/test/boost_no_std_oi_assign.ipp
+++ b/test/boost_no_std_oi_assign.ipp
@ -34,4 +34,6 @@ int test()
 }

 }
- 
+
+
+