From 18bfd504385d64edb3fdf56da491047676aa6922 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sat, 15 Oct 2005 17:05:59 +0000 Subject: [PATCH] Need to use as well as to be sure of detecting std lib version. [SVN r31339] --- include/boost/config/select_stdlib_config.hpp | 7 ++++++- include/boost/config/stdlib/sgi.hpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/boost/config/select_stdlib_config.hpp b/include/boost/config/select_stdlib_config.hpp index 20a24a75..1c369745 100644 --- a/include/boost/config/select_stdlib_config.hpp +++ b/include/boost/config/select_stdlib_config.hpp @@ -12,12 +12,17 @@ // locate which std lib we are using and define BOOST_STDLIB_CONFIG as needed: // we need to include a std lib header here in order to detect which -// library is in use, use as it's about the smallest +// library is in use, use and as they're about the smallest // of the std lib headers - do not rely on this header being included - // users can short-circuit this header if they know whose std lib // they are using. +// PLEASE NOTE that the config system must not include any of the headers +// that are modified by TR1 (, or ) not even +// indirectly. If they do so then the Boost TR1 implementation will be unusable. +// #include +#include #if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) // STLPort library; this _must_ come first, otherwise since diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp index 7cc52da7..a614bc18 100644 --- a/include/boost/config/stdlib/sgi.hpp +++ b/include/boost/config/stdlib/sgi.hpp @@ -10,7 +10,7 @@ // generic SGI STL: #if !defined(__STL_CONFIG_H) -# include +# include # if !defined(__STL_CONFIG_H) # error "This is not the SGI STL!" # endif