From d8e8bfc66704f03f516009ad506001bcf17b828c Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 8 Oct 2001 11:29:42 +0000 Subject: [PATCH] Modified behaviour of BOOST_NO_CWCHAR definition [SVN r11352] --- include/boost/config/stdlib/stlport.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp index e42885cb..48b3b718 100644 --- a/include/boost/config/stdlib/stlport.hpp +++ b/include/boost/config/stdlib/stlport.hpp @@ -92,9 +92,11 @@ #endif // -// If STLport thinks there are no wide functions, etc. is not working. +// If STLport thinks there are no wide functions, etc. is not working; but +// only if BOOST_NO_STDC_NAMESPACE is not defined (if it is then we do the import +// into std:: ourselves). // -#if defined(_STLP_NO_NATIVE_WIDE_FUNCTIONS) +#if defined(_STLP_NO_NATIVE_WIDE_FUNCTIONS) && !defined(BOOST_NO_STDC_NAMESPACE) # define BOOST_NO_CWCHAR # define BOOST_NO_CWTYPE #endif @@ -103,3 +105,4 @@ #define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT) +