diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-25 23:41:46 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-25 23:41:46 +0000 |
| commit | d11c7d5751b049d4aba39d7c9d979014b2802622 (patch) | |
| tree | e0c48c2b98a1abf7bd4e2eb57edda924e83f915c /cpp/src/slice2java/Gen.cpp | |
| parent | Renamings (ICE-4868): (diff) | |
| download | ice-d11c7d5751b049d4aba39d7c9d979014b2802622.tar.bz2 ice-d11c7d5751b049d4aba39d7c9d979014b2802622.tar.xz ice-d11c7d5751b049d4aba39d7c9d979014b2802622.zip | |
Renamed OptionalType to OptionalFormat in Java (ICE-4868)
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 1b049475ffd..6c59d6b218f 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -475,7 +475,7 @@ Slice::JavaVisitor::writeMarshalDataMember(Output& out, const string& package, c else { out << nl << "if(__has_" << member->name() << " && __os.writeOpt(" << member->tag() << ", " - << getOptionalType(member->type()) << "))"; + << getOptionalFormat(member->type()) << "))"; out << sb; writeMarshalUnmarshalCode(out, package, member->type(), OptionalMember, false, 0, fixKwd(member->name()), true, iter, false, member->getMetaData()); @@ -507,7 +507,7 @@ Slice::JavaVisitor::writeUnmarshalDataMember(Output& out, const string& package, else { out << nl << "if(__has_" << member->name() << " = __is.readOpt(" << member->tag() << ", " - << getOptionalType(member->type()) << "))"; + << getOptionalFormat(member->type()) << "))"; out << sb; writeMarshalUnmarshalCode(out, package, member->type(), OptionalMember, false, 0, fixKwd(member->name()), false, iter, false, member->getMetaData(), patchParams); @@ -527,7 +527,7 @@ Slice::JavaVisitor::writeStreamMarshalDataMember(Output& out, const string& pack else { out << nl << "if(__has_" << member->name() << " && __outS.writeOptional(" << member->tag() << ", " - << getOptionalType(member->type()) << "))"; + << getOptionalFormat(member->type()) << "))"; out << sb; writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()), true, iter, false, member->getMetaData()); @@ -559,7 +559,7 @@ Slice::JavaVisitor::writeStreamUnmarshalDataMember(Output& out, const string& pa else { out << nl << "if(__has_" << member->name() << " = __inS.readOptional(" << member->tag() << ", " - << getOptionalType(member->type()) << "))"; + << getOptionalFormat(member->type()) << "))"; out << sb; writeStreamMarshalUnmarshalCode(out, package, member->type(), true, member->tag(), fixKwd(member->name()), false, iter, false, member->getMetaData(), patchParams); |