From c1e69eecff961368fdf0e07147e01a5d4f11fcbe Mon Sep 17 00:00:00 2001 From: nobody Date: Fri, 1 Dec 2000 02:27:07 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'shared_modules'. [SVN r8376] --- include/boost/python/operators.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/python/operators.hpp b/include/boost/python/operators.hpp index 40400f47..100c62aa 100644 --- a/include/boost/python/operators.hpp +++ b/include/boost/python/operators.hpp @@ -7,7 +7,7 @@ // When STLport is used with native streams, _STL::ostringstream().str() is not // _STL::string, but std::string. This confuses to_python(), so we'll use // strstream instead. Also, GCC 2.95.2 doesn't have sstream. -# if defined(__SGI_STL_PORT) ? __SGI_STL_OWN_IOSTREAMS : !defined(__GNUC__) || __GNUC__ > 2 +# if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2) # include # else # include @@ -482,7 +482,7 @@ namespace detail // When STLport is used with native streams, _STL::ostringstream().str() is not // _STL::string, but std::string. -#if defined(__SGI_STL_PORT) ? __SGI_STL_OWN_IOSTREAMS : !defined(__GNUC__) +#if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2) std::ostringstream s; s << BOOST_PYTHON_CONVERSION::from_python(args[0].get(), boost::python::type()); return BOOST_PYTHON_CONVERSION::to_python(s.str());