summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/JavaUtil.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2006-06-08 14:15:20 +0000
committerMark Spruiell <mes@zeroc.com>2006-06-08 14:15:20 +0000
commitf85a964893e985543dd87a1da616a445130761ac (patch)
tree8a8a8a610c8740f8944faa21e00b16e9a1ed88f3 /cpp/src/Slice/JavaUtil.cpp
parentFix (diff)
downloadice-f85a964893e985543dd87a1da616a445130761ac.tar.bz2
ice-f85a964893e985543dd87a1da616a445130761ac.tar.xz
ice-f85a964893e985543dd87a1da616a445130761ac.zip
fix for bug 774: simplify use of streaming API in templates
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r--cpp/src/Slice/JavaUtil.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 893c59ad267..ccfd8e55bfc 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -2068,13 +2068,13 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out,
{
if(marshal)
{
- out << nl << v << ".__write(" << stream << ");";
+ out << nl << v << ".ice_write(" << stream << ");";
}
else
{
string typeS = typeToString(type, TypeModeIn, package);
out << nl << v << " = new " << typeS << "();";
- out << nl << v << ".__read(" << stream << ");";
+ out << nl << v << ".ice_read(" << stream << ");";
}
return;
}
@@ -2084,12 +2084,12 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out,
{
if(marshal)
{
- out << nl << v << ".__write(" << stream << ");";
+ out << nl << v << ".ice_write(" << stream << ");";
}
else
{
string typeS = typeToString(type, TypeModeIn, package);
- out << nl << v << " = " << typeS << ".__read(" << stream << ");";
+ out << nl << v << " = " << typeS << ".ice_read(" << stream << ");";
}
return;
}