From f3e216f001d6fb6af75f9728930bddf3da59cccf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 16 Aug 2018 23:36:38 +0900 Subject: Switch from strstream to sstream. Signed-off-by: Michele Calgaro (cherry picked from commit 7a7c17092fcdd4772fb6e499ef13429f96ac04bb) --- lib/kross/python/cxx/Objects.hxx | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'lib/kross/python/cxx/Objects.hxx') diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx index 416483206..28662d4fa 100644 --- a/lib/kross/python/cxx/Objects.hxx +++ b/lib/kross/python/cxx/Objects.hxx @@ -17,7 +17,7 @@ #include -#include STR_STREAM +#include #include #include #include @@ -30,10 +30,10 @@ namespace Py // Forward declarations class Object; class Type; - template class SeqBase; + template class SeqBase; class String; class List; - template class MapBase; + template class MapBase; // new_reference_to also overloaded below on Object inline PyObject* new_reference_to(PyObject* p) @@ -837,7 +837,7 @@ namespace Py // Changing them to Object(x[i]) helps the compiler to understand that the // conversion of a seqref to an Object is wanted. - template + template class seqref { protected: @@ -1027,7 +1027,7 @@ namespace Py // class SeqBase // ...the base class for all sequence types - template + template class SeqBase: public Object { public: @@ -1289,7 +1289,7 @@ namespace Py std::string diagnose() const { - std::OSTRSTREAM oss; + std::ostringstream oss; oss << "iterator diagnosis " << seq << ", " << count << std::ends; return std::string(oss.str()); } @@ -1436,19 +1436,19 @@ namespace Py // Here's an important typedef you might miss if reading too fast... typedef SeqBase Sequence; - template bool operator==(const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); - template bool operator!=(const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); - template bool operator< (const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); - template bool operator> (const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); - template bool operator<=(const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); - template bool operator>=(const EXPLICIT_TYPENAME SeqBase::iterator& left, const EXPLICIT_TYPENAME SeqBase::iterator& right); + template bool operator==(const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); + template bool operator!=(const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); + template bool operator< (const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); + template bool operator> (const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); + template bool operator<=(const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); + template bool operator>=(const typename SeqBase::iterator& left, const typename SeqBase::iterator& right); - template bool operator==(const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); - template bool operator!=(const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); - template bool operator< (const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); - template bool operator> (const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); - template bool operator<=(const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); - template bool operator>=(const EXPLICIT_TYPENAME SeqBase::const_iterator& left, const EXPLICIT_TYPENAME SeqBase::const_iterator& right); + template bool operator==(const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); + template bool operator!=(const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); + template bool operator< (const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); + template bool operator> (const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); + template bool operator<=(const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); + template bool operator>=(const typename SeqBase::const_iterator& left, const typename SeqBase::const_iterator& right); extern bool operator==(const Sequence::iterator& left, const Sequence::iterator& right); @@ -1916,7 +1916,7 @@ namespace Py // Mappings // ================================================== - template + template class mapref { protected: @@ -2085,7 +2085,7 @@ namespace Py return true; // not completed. } - template + template class MapBase: public Object { protected: @@ -2372,7 +2372,7 @@ namespace Py std::string diagnose() const { - std::OSTRSTREAM oss; + std::ostringstream oss; oss << "iterator diagnosis " << map << ", " << pos << std::ends; return std::string(oss.str()); } @@ -2477,10 +2477,10 @@ namespace Py typedef MapBase Mapping; - template bool operator==(const EXPLICIT_TYPENAME MapBase::iterator& left, const EXPLICIT_TYPENAME MapBase::iterator& right); - template bool operator!=(const EXPLICIT_TYPENAME MapBase::iterator& left, const EXPLICIT_TYPENAME MapBase::iterator& right); - template bool operator==(const EXPLICIT_TYPENAME MapBase::const_iterator& left, const EXPLICIT_TYPENAME MapBase::const_iterator& right); - template bool operator!=(const EXPLICIT_TYPENAME MapBase::const_iterator& left, const EXPLICIT_TYPENAME MapBase::const_iterator& right); + template bool operator==(const typename MapBase::iterator& left, const typename MapBase::iterator& right); + template bool operator!=(const typename MapBase::iterator& left, const typename MapBase::iterator& right); + template bool operator==(const typename MapBase::const_iterator& left, const typename MapBase::const_iterator& right); + template bool operator!=(const typename MapBase::const_iterator& left, const typename MapBase::const_iterator& right); extern bool operator==(const Mapping::iterator& left, const Mapping::iterator& right); extern bool operator!=(const Mapping::iterator& left, const Mapping::iterator& right); @@ -2787,13 +2787,13 @@ namespace Py -template +template String seqref::str () const { return the_item.str(); } -template +template String seqref::repr () const { return the_item.repr(); -- cgit v1.2.3