diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
| commit | 5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec (patch) | |
| tree | 71f7dd2a1096dab81bd8ddb4e17d5ac42f38c65d /cpp/src/slice2java/Gen.cpp | |
| parent | Fixes (diff) | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.bz2 ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.xz ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index b15dc0d5f5a..472acac73f7 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -636,7 +636,7 @@ Slice::JavaVisitor::writeStreamMarshalDataMember(Output& out, const string& pack { if(!member->optional()) { - writeStreamMarshalUnmarshalCode(out, package, member->type(), OptionalNone, 0, fixKwd(member->name()), true, + writeStreamMarshalUnmarshalCode(out, package, member->type(), false, 0, fixKwd(member->name()), true, iter, false, member->getMetaData()); } else @@ -644,8 +644,8 @@ Slice::JavaVisitor::writeStreamMarshalDataMember(Output& out, const string& pack out << nl << "if(__has_" << member->name() << " && __outS.writeOptional(" << member->tag() << ", " << getOptionalType(member->type()) << "))"; out << sb; - writeStreamMarshalUnmarshalCode(out, package, member->type(), OptionalMember, member->tag(), - fixKwd(member->name()), true, iter, false, member->getMetaData()); + writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()), + true, iter, false, member->getMetaData()); out << eb; } } @@ -668,7 +668,7 @@ Slice::JavaVisitor::writeStreamUnmarshalDataMember(Output& out, const string& pa if(!member->optional()) { - writeStreamMarshalUnmarshalCode(out, package, member->type(), OptionalNone, 0, fixKwd(member->name()), false, + writeStreamMarshalUnmarshalCode(out, package, member->type(), false, 0, fixKwd(member->name()), false, iter, false, member->getMetaData(), patchParams); } else @@ -676,8 +676,8 @@ Slice::JavaVisitor::writeStreamUnmarshalDataMember(Output& out, const string& pa out << nl << "if(__has_" << member->name() << " = __inS.readOptional(" << member->tag() << ", " << getOptionalType(member->type()) << "))"; out << sb; - writeStreamMarshalUnmarshalCode(out, package, member->type(), OptionalMember, member->tag(), - fixKwd(member->name()), false, iter, false, member->getMetaData(), patchParams); + writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()), + false, iter, false, member->getMetaData(), patchParams); out << eb; } } |