First round of config fixes

[SVN r11146]
This commit is contained in:
John Maddock
2001-09-19 11:48:51 +00:00
parent 3b890c53ab
commit 7ce333aa88
9 changed files with 44 additions and 36 deletions

View File

@@ -13,6 +13,8 @@
# define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS # define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
# if defined(_MSC_VER) && _MSC_VER <= 1200 # if defined(_MSC_VER) && _MSC_VER <= 1200
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
# define BOOST_NO_SWPRINTF
# endif # endif
#endif #endif

View File

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

View File

@@ -15,7 +15,7 @@
# endif # endif
# if __MWERKS__ <= 0x2401 // 6.2 # if __MWERKS__ <= 0x2401 // 6.2
# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING //# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
# endif # endif
# if(__MWERKS__ <= 0x2405) || !defined(BOOST_STRICT_CONFIG) // 7 # if(__MWERKS__ <= 0x2405) || !defined(BOOST_STRICT_CONFIG) // 7

View File

@@ -36,7 +36,7 @@
# define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING # define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
# define BOOST_NO_USING_TEMPLATE # define BOOST_NO_USING_TEMPLATE
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF
# define BOOST_NO_POINTER_TO_MEMBER_CONST //# define BOOST_NO_POINTER_TO_MEMBER_CONST
// //
// disable man/max macros if defined: // disable man/max macros if defined:
// //

View File

@@ -12,62 +12,62 @@
#if defined __GNUC__ #if defined __GNUC__
// GNU C++: // GNU C++:
# define BOOST_COMPILER_CONFIG <boost/config/compiler/gcc.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"
#elif defined __KCC #elif defined __KCC
// Kai C++ // Kai C++
# define BOOST_COMPILER_CONFIG <boost/config/compiler/kai.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/kai.hpp"
#elif defined __sgi #elif defined __sgi
// SGI MIPSpro C++ // 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 #elif defined __DECCXX
// Compaq Tru64 Unix cxx // 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 #elif defined __ghs
// Greenhills C++ // Greenhills C++
# define BOOST_COMPILER_CONFIG <boost/config/compiler/greenhills.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
#elif defined __BORLANDC__ #elif defined __BORLANDC__
// Borland // Borland
# define BOOST_COMPILER_CONFIG <boost/config/compiler/borland.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
#elif defined(__ICL) || defined(__ICC) #elif defined(__ICL) || defined(__ICC)
// Intel // Intel
# define BOOST_COMPILER_CONFIG <boost/config/compiler/intel.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
#elif defined __MWERKS__ #elif defined __MWERKS__
// Metrowerks CodeWarrior // Metrowerks CodeWarrior
# define BOOST_COMPILER_CONFIG <boost/config/compiler/metrowerks.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"
#elif defined __SUNPRO_CC #elif defined __SUNPRO_CC
// Sun Workshop Compiler C++ // 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 #elif defined __HP_aCC
// 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__) #elif defined(__MRC__) || defined(__SC__)
// MPW MrCpp or SCpp // 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__) #elif defined(__IBMCPP__)
// IBM Visual Age // IBM Visual Age
# define BOOST_COMPILER_CONFIG <boost/config/compiler/vacpp.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp"
# elif defined __COMO__ # elif defined __COMO__
// Comeau C++ // Comeau C++
# define BOOST_COMPILER_CONFIG <boost/config/compiler/comeau.hpp> # define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"
#elif defined _MSC_VER #elif defined _MSC_VER
// Microsoft Visual C++ // Microsoft Visual C++
// //
// Must remain the last #elif since some other vendors (Metrowerks, for // Must remain the last #elif since some other vendors (Metrowerks, for
// example) also #define _MSC_VER // 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) #elif defined (BOOST_ASSERT_CONFIG)
// this must come last - generate an error if we don't // this must come last - generate an error if we don't

View File

@@ -21,31 +21,31 @@
// STLPort library; this _must_ come first, otherwise since // STLPort library; this _must_ come first, otherwise since
// STLport typically sits on top of some other library, we // STLport typically sits on top of some other library, we
// can end up detecting that first rather than STLport: // 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) #elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
// Rogue Wave library: // 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) #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
// Dinkumware Library: // Dinkumware Library:
# define BOOST_STDLIB_CONFIG <boost/config/stdlib/dinkumware.hpp> # define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
#elif defined(__GLIBCPP__) #elif defined(__GLIBCPP__)
// GNU libstdc++ 3 // 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) #elif defined(__STL_CONFIG_H)
// generic SGI STL // 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__) #elif defined(__MSL_CPP__)
// MSL standard lib: // MSL standard lib:
# define BOOST_STDLIB_CONFIG <boost/config/stdlib/msl.hpp> # define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp"
# elif defined(__IBMCPP__) # elif defined(__IBMCPP__)
// take the default VACPP std lib // 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) #elif defined (BOOST_ASSERT_CONFIG)
// this must come last - generate an error if we don't // this must come last - generate an error if we don't

View File

@@ -29,9 +29,7 @@
#if defined(__MSL__) && (__MSL__ >= 0x5000) #if defined(__MSL__) && (__MSL__ >= 0x5000)
# define BOOST_HAS_STDINT_H # define BOOST_HAS_STDINT_H
# if defined(macintosh) # define BOOST_HAS_UNISTD_H
# define BOOST_HAS_UNISTD_H
# endif
#endif #endif

View File

@@ -37,7 +37,7 @@
// Assume no std::locale without own iostreams (this may be an // Assume no std::locale without own iostreams (this may be an
// incorrect assumption in some cases): // 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 # define BOOST_NO_STD_LOCALE
#endif #endif

View File

@@ -34,4 +34,6 @@ int test()
} }
} }