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/slice2cpp/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/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0807ffbfe34..2a89e55b851 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -919,8 +919,8 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) if(_stream) { - H << sp << nl << _dllExport << "void __write(const ::Ice::OutputStreamPtr&) const;"; - H << nl << _dllExport << "void __read(const ::Ice::InputStreamPtr&);"; + H << sp << nl << _dllExport << "void ice_write(const ::Ice::OutputStreamPtr&) const;"; + H << nl << _dllExport << "void ice_read(const ::Ice::InputStreamPtr&);"; } C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const"; @@ -942,7 +942,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) if(_stream) { C << sp << nl << "void" << nl << scoped.substr(2) - << "::__write(const ::Ice::OutputStreamPtr& __outS) const"; + << "::ice_write(const ::Ice::OutputStreamPtr& __outS) const"; C << sb; for(q = dataMembers.begin(); q != dataMembers.end(); ++q) { @@ -951,7 +951,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) } C << eb; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __inS)"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::ice_read(const ::Ice::InputStreamPtr& __inS)"; C << sb; for(q = dataMembers.begin(); q != dataMembers.end(); ++q) { @@ -973,13 +973,13 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) C << sp << nl << "void" << nl << scope.substr(2) << "ice_write" << p->name() << "(const ::Ice::OutputStreamPtr& __outS, const " << scoped << "& __v)"; C << sb; - C << nl << "__v.__write(__outS);"; + C << nl << "__v.ice_write(__outS);"; C << eb; C << sp << nl << "void" << nl << scope.substr(2) << "ice_read" << p->name() << "(const ::Ice::InputStreamPtr& __inS, " << scoped << "& __v)"; C << sb; - C << nl << "__v.__read(__inS);"; + C << nl << "__v.ice_read(__inS);"; C << eb; } |