diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-08-27 20:49:28 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-08-27 20:49:28 +0000 |
| commit | 96562f821fd2ba5e5ed1eb3ec6991e60c1402f06 (patch) | |
| tree | 4a8b677c8c89a6c5f89cb83f320e0f0a8343cf4f /cpp/src/slice2cpp | |
| parent | Added per-proxy contexts to icej. For ice, added context to operator== and (diff) | |
| download | ice-96562f821fd2ba5e5ed1eb3ec6991e60c1402f06.tar.bz2 ice-96562f821fd2ba5e5ed1eb3ec6991e60c1402f06.tar.xz ice-96562f821fd2ba5e5ed1eb3ec6991e60c1402f06.zip | |
Freeze Evictor facet changes
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 5fd71262f4e..7ec8e902650 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2392,7 +2392,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) H << nl << "virtual void __read(::IceInternal::BasicStream*, bool = true);"; H << sp; - H << nl << "virtual void __marshal(const ::Ice::StreamPtr&) const;"; + H << nl << "virtual void __marshal(const ::Ice::StreamPtr&, bool) const;"; H << nl << "virtual void __unmarshal(const ::Ice::StreamPtr&);"; H << sp; @@ -2430,9 +2430,9 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) C << sp; C << nl << "void" << nl << scoped.substr(2) - << "::__marshal(const ::Ice::StreamPtr& __os) const"; + << "::__marshal(const ::Ice::StreamPtr& __os, bool __marshalFacets) const"; C << sb; - emitClassBase(base, "__os", "__marshal"); + emitClassBase(base, "__os, __marshalFacets", "__marshal"); writeGenericMarshalCode(C, memberList, 0); C << eb; |