bug 711 - accept Unicode objects in Python

2 files changed, 12 insertions, 12 deletions

diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index 48cc7ce9497..26ecc8acb19 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -208,18 +208,18 @@ Ice::InputStreamI::readDoubleSeq(pair<const Double*, const Double*>& p)
 }
 
 string
-Ice::InputStreamI::readString()
+Ice::InputStreamI::readString(bool convert)
 {
     string v;
-    _is->read(v);
+    _is->read(v, convert);
     return v;
 }
 
 vector<string>
-Ice::InputStreamI::readStringSeq()
+Ice::InputStreamI::readStringSeq(bool convert)
 {
     vector<string> v;
-    _is->read(v);
+    _is->read(v, convert);
     return v;
 }
 
@@ -522,13 +522,13 @@ Ice::OutputStreamI::writeDoubleSeq(const Double* begin, const Double* end)
 }
 
 void
-Ice::OutputStreamI::writeString(const string& v)
+Ice::OutputStreamI::writeString(const string& v, bool convert)
 {
-    _os->write(v);
+    _os->write(v, convert);
 }
 
 void
-Ice::OutputStreamI::writeStringSeq(const vector<string>& v)
+Ice::OutputStreamI::writeStringSeq(const vector<string>& v, bool convert)
 {
     if(v.size() == 0)
     {
@@ -536,7 +536,7 @@ Ice::OutputStreamI::writeStringSeq(const vector<string>& v)
     }
     else
     {
-        _os->write(&v[0], &v[0] + v.size());
+        _os->write(&v[0], &v[0] + v.size(), convert);
     }
 }
 
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index 584d9f941fe..9941b216c06 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -59,8 +59,8 @@ public:
     virtual std::vector< Ice::Double > readDoubleSeq();
     virtual Ice::Double* readDoubleSeq(std::pair<const Ice::Double*, const Ice::Double*>&);
 
-    virtual std::string readString();
-    virtual std::vector< std::string > readStringSeq();
+    virtual std::string readString(bool = true);
+    virtual std::vector< std::string > readStringSeq(bool = true);
 
     virtual std::wstring readWstring();
     virtual std::vector< std::wstring > readWstringSeq();
@@ -132,8 +132,8 @@ public:
     virtual void writeDoubleSeq(const std::vector< Ice::Double >&);
     virtual void writeDoubleSeq(const Ice::Double*, const Ice::Double*);
 
-    virtual void writeString(const std::string&);
-    virtual void writeStringSeq(const std::vector< std::string >&);
+    virtual void writeString(const std::string&, bool = true);
+    virtual void writeStringSeq(const std::vector< std::string >&, bool = true);
 
     virtual void writeWstring(const std::wstring&);
     virtual void writeWstringSeq(const std::vector< std::wstring >&);