diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 12:10:49 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 12:10:49 +0200 |
| commit | e706fb2ceb23b1ee3c225f6d9569c58359b4ee72 (patch) | |
| tree | 56d6d90d0a079d89ee7b2ab1c1013055cdca6e29 /cpp/src/slice2java/GenCompat.cpp | |
| parent | ICE-8218 - Windows OpenSSL test build failure with parallel builds (diff) | |
| download | ice-e706fb2ceb23b1ee3c225f6d9569c58359b4ee72.tar.bz2 ice-e706fb2ceb23b1ee3c225f6d9569c58359b4ee72.tar.xz ice-e706fb2ceb23b1ee3c225f6d9569c58359b4ee72.zip | |
Fixed ICE-8217 - added ice_getSlicedData method to Ice values and Ice::SlicedData::clear method to break cyclic references
Diffstat (limited to 'cpp/src/slice2java/GenCompat.cpp')
| -rw-r--r-- | cpp/src/slice2java/GenCompat.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index ff59af9df2a..14279536038 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -1680,6 +1680,11 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe if(preserved && !basePreserved) { + out << sp << nl << "public Ice.SlicedData ice_getSlicedData()"; + out << sb; + out << nl << "return _iceSlicedData;"; + out << eb; + out << sp << nl << "public void _iceWrite(Ice.OutputStream ostr)"; out << sb; out << nl << "ostr.startValue(_iceSlicedData);"; @@ -3417,7 +3422,6 @@ Slice::GenCompat::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(preserved && !basePreserved) { - out << sp << nl << "public void" << nl << "_write(Ice.OutputStream ostr)"; out << sb; out << nl << "ostr.startException(_slicedData);"; |