diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-06-08 14:15:20 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-06-08 14:15:20 +0000 |
| commit | f85a964893e985543dd87a1da616a445130761ac (patch) | |
| tree | 8a8a8a610c8740f8944faa21e00b16e9a1ed88f3 /cpp/src/slice2java/Gen.cpp | |
| parent | Fix (diff) | |
| download | ice-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/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 97801c21228..bdeac27b779 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -2460,7 +2460,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) if(_stream) { - out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __outS)"; + out << sp << nl << "public void" << nl << "ice_write(Ice.OutputStream __outS)"; out << sb; iter = 0; for(d = members.begin(); d != members.end(); ++d) @@ -2471,7 +2471,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) } out << eb; - out << sp << nl << "public void" << nl << "__read(Ice.InputStream __inS)"; + out << sp << nl << "public void" << nl << "ice_read(Ice.InputStream __inS)"; out << sb; iter = 0; classMemberCount = 0; @@ -2833,7 +2833,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p) if(_stream) { - out << sp << nl << "public void" << nl << "__write(Ice.OutputStream __outS)"; + out << sp << nl << "public void" << nl << "ice_write(Ice.OutputStream __outS)"; out << sb; if(sz <= 0x7f) { @@ -2849,7 +2849,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p) } out << eb; - out << sp << nl << "public static " << name << nl << "__read(Ice.InputStream __inS)"; + out << sp << nl << "public static " << name << nl << "ice_read(Ice.InputStream __inS)"; out << sb; if(sz <= 0x7f) { @@ -3548,13 +3548,13 @@ Slice::Gen::HelperVisitor::visitStructStart(const StructPtr& p) out << sp << nl << "public static void" << nl << "write(Ice.OutputStream __outS, " << fixedName << " __v)"; out << sb; - out << nl << "__v.__write(__outS);"; + out << nl << "__v.ice_write(__outS);"; out << eb; out << sp << nl << "public static " << fixedName << nl << "read(Ice.InputStream __inS)"; out << sb; out << nl << fixedName << " __v = new " << fixedName << "();"; - out << nl << "__v.__read(__inS);"; + out << nl << "__v.ice_read(__inS);"; out << nl << "return __v;"; out << eb; @@ -3715,12 +3715,12 @@ Slice::Gen::HelperVisitor::visitEnum(const EnumPtr& p) out << sp << nl << "public static void" << nl << "write(Ice.OutputStream __outS, " << fixedName << " __v)"; out << sb; - out << nl << "__v.__write(__outS);"; + out << nl << "__v.ice_write(__outS);"; out << eb; out << sp << nl << "public static " << fixedName << nl << "read(Ice.InputStream __inS)"; out << sb; - out << nl << "return " << fixedName << ".__read(__inS);"; + out << nl << "return " << fixedName << ".ice_read(__inS);"; out << eb; out << eb; |