diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-03-05 15:20:12 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-03-05 15:20:12 +0100 |
| commit | 279cc589ece5abaeb735974e799c809227e0aa83 (patch) | |
| tree | 186204caab0ce3d9cf39a5f09736e6b750e95b67 /cpp/src/slice2java/Gen.cpp | |
| parent | Fixed copy/paste error for reading replica cert CN property (diff) | |
| download | ice-279cc589ece5abaeb735974e799c809227e0aa83.tar.bz2 ice-279cc589ece5abaeb735974e799c809227e0aa83.tar.xz ice-279cc589ece5abaeb735974e799c809227e0aa83.zip | |
ICE-4793 - Fixes to prevent GCC shadow warnings and other minor fixes
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 76c5ea40c99..906d8aaca90 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -4088,7 +4088,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "__result.__prepare(__" << op->name() << "_name, " << sliceModeToIceMode(op->sendMode()) << ", __ctx, __explicitCtx);"; - out << nl << "IceInternal.BasicStream __os = __result.__os();"; + out << nl << "IceInternal.BasicStream __os = __result.__getOs();"; iter = 0; for(pli = paramList.begin(); pli != paramList.end(); ++pli) { @@ -4171,7 +4171,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) } } - out << nl << "IceInternal.BasicStream __is = __result.__is();"; + out << nl << "IceInternal.BasicStream __is = __result.__getIs();"; if(ret || !outParams.empty()) { out << nl << "__is.startReadEncaps();"; @@ -5372,7 +5372,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "try"; out << sb; - out << sp << nl << "Ice.DispatchStatus __status = __direct.servant().__collocDispatch(__direct);"; + out << sp << nl << "Ice.DispatchStatus __status = __direct.getServant().__collocDispatch(__direct);"; out << nl << "if(__status == Ice.DispatchStatus.DispatchUserException)"; out << sb; out << nl << "__direct.throwUserException();"; @@ -6147,7 +6147,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) { out << nl << "try"; out << sb; - out << nl << "IceInternal.BasicStream __os = this.__os();"; + out << nl << "IceInternal.BasicStream __os = this.__getOs();"; for(pli = outParams.begin(); pli != outParams.end(); ++pli) { StringList metaData = (*pli)->getMetaData(); @@ -6190,7 +6190,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) out << sb; out << nl << "if(__validateResponse(false))"; out << sb; - out << nl << "__os().writeUserException(__ex);"; + out << nl << "__getOs().writeUserException(__ex);"; out << nl << "__response(false);"; out << eb; out << eb; |