diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-06 16:42:35 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-06 16:42:35 -0500 |
| commit | d7778df86336f3becb561463ae24243ccfe02164 (patch) | |
| tree | 4e437427a9d333b44665fbdecea239350c800522 /cpp/src/slice2java/GenCompat.cpp | |
| parent | Test script fix, don't terminate the process twice (diff) | |
| download | ice-d7778df86336f3becb561463ae24243ccfe02164.tar.bz2 ice-d7778df86336f3becb561463ae24243ccfe02164.tar.xz ice-d7778df86336f3becb561463ae24243ccfe02164.zip | |
Renamed Slice/keyword test to clash, and added identifier-clash test
Diffstat (limited to 'cpp/src/slice2java/GenCompat.cpp')
| -rw-r--r-- | cpp/src/slice2java/GenCompat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 2075af5be57..9890c3c68f0 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -1845,7 +1845,7 @@ Slice::JavaCompatVisitor::writeDataMemberInitializers(Output& out, const DataMem } else { - out << nl << fixKwd((*p)->name()) << " = "; + out << nl << "this." << fixKwd((*p)->name()) << " = "; writeConstantValue(out, t, (*p)->defaultValueType(), (*p)->defaultValue(), package); out << ';'; } @@ -1855,21 +1855,21 @@ Slice::JavaCompatVisitor::writeDataMemberInitializers(Output& out, const DataMem BuiltinPtr builtin = BuiltinPtr::dynamicCast(t); if(builtin && builtin->kind() == Builtin::KindString) { - out << nl << fixKwd((*p)->name()) << " = \"\";"; + out << nl << "this." << fixKwd((*p)->name()) << " = \"\";"; } EnumPtr en = EnumPtr::dynamicCast(t); if(en) { string firstEnum = fixKwd(en->getEnumerators().front()->name()); - out << nl << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; + out << nl << "this." << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; } StructPtr st = StructPtr::dynamicCast(t); if(st) { string memberType = typeToString(st, TypeModeMember, package, (*p)->getMetaData()); - out << nl << fixKwd((*p)->name()) << " = new " << memberType << "();"; + out << nl << "this." << fixKwd((*p)->name()) << " = new " << memberType << "();"; } } } |