summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/StreamI.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-04-28 11:16:08 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-04-28 11:16:08 +0800
commitb4c5f6cf95cfe3d56c967b91deaeeb87da7148ce (patch)
tree2b7620aa78f750ce178e39d1b8a99c3e5f6e01db /cpp/src/Ice/StreamI.cpp
parentremoved bogus rule. (diff)
parentminor edits to README for secure IceGrid demo (diff)
downloadice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.bz2
ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.tar.xz
ice-b4c5f6cf95cfe3d56c967b91deaeeb87da7148ce.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/StreamI.cpp')
-rw-r--r--cpp/src/Ice/StreamI.cpp16
1 files changed, 8 insertions, 8 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);
}
}