Skip to content

Commit b91d114

Browse files
committed
Applied fixes for como courtesy of Jens Maurer.
[SVN r8375]
1 parent ff31b16 commit b91d114

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/boost/python/operators.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// When STLport is used with native streams, _STL::ostringstream().str() is not
88
// _STL::string, but std::string. This confuses to_python(), so we'll use
99
// strstream instead. Also, GCC 2.95.2 doesn't have sstream.
10-
# if defined(__SGI_STL_PORT) ? __SGI_STL_OWN_IOSTREAMS : !defined(__GNUC__) || __GNUC__ > 2
10+
# if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2)
1111
# include <sstream>
1212
# else
1313
# include <strstream>
@@ -482,7 +482,7 @@ namespace detail
482482

483483
// When STLport is used with native streams, _STL::ostringstream().str() is not
484484
// _STL::string, but std::string.
485-
#if defined(__SGI_STL_PORT) ? __SGI_STL_OWN_IOSTREAMS : !defined(__GNUC__)
485+
#if defined(__SGI_STL_PORT) ? defined(__SGI_STL_OWN_IOSTREAMS) : (!defined(__GNUC__) || __GNUC__ > 2)
486486
std::ostringstream s;
487487
s << BOOST_PYTHON_CONVERSION::from_python(args[0].get(), boost::python::type<operand>());
488488
return BOOST_PYTHON_CONVERSION::to_python(s.str());

0 commit comments

Comments
 (0)