diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 75b457a5897..78a2ba05549 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -628,7 +628,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, if(def && !def->isAbstract()) { out << nl << v << " = (" << typeS << ')' << stream << ".readObject(" << typeS << ".ice_staticId(), " - << typeS << "._factory);"; + << typeS << ".ice_factory());"; } else { @@ -1326,7 +1326,7 @@ Slice::JavaGenerator::writeGenericMarshalUnmarshalCode(Output& out, if(def && !def->isAbstract()) { out << nl << v << " = (" << typeS << ')' << stream << ".readObject(" << name << ", " << typeS - << ".ice_staticId(), " << typeS << "._factory);"; + << ".ice_staticId(), " << typeS << ".ice_factory());"; } else { diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 16edaee1182..18149315339 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1101,7 +1101,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << eb; out << eb; - out << nl << "public static Ice.ObjectFactory _factory = new __F();"; + out << nl << "private static Ice.ObjectFactory _factory = new __F();"; out << sp; out << nl << "public static Ice.ObjectFactory" << nl << "ice_factory()"; out << sb; |