summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cpp/Gen.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-05-24 15:19:00 -0700
committerMark Spruiell <mes@zeroc.com>2012-05-24 15:19:00 -0700
commit5a41711e8fc712fca0da595860458d4ffe349c36 (patch)
treee750db6765a2f2e8cf71289fdc9a2d8bc88064cd /cpp/src/slice2cpp/Gen.cpp
parentPHP port; misc. fixes (diff)
downloadice-5a41711e8fc712fca0da595860458d4ffe349c36.tar.bz2
ice-5a41711e8fc712fca0da595860458d4ffe349c36.tar.xz
ice-5a41711e8fc712fca0da595860458d4ffe349c36.zip
remove use of readPendingObjects/writePendingObjects
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index ecbc5b215be..021ee80172c 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2681,10 +2681,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
C << nl << "__os->format(" << formatTypeToString(format) << ");";
}
writeMarshalCode(C, inParams, 0, StringList(), TypeContextInParam);
- if(p->sendsClasses())
- {
- C << nl << "__os->writePendingObjects();";
- }
C << nl << "__result->__endWriteParams();";
}
C << nl << "__result->__send(true);";
@@ -2746,10 +2742,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
{
C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();";
writeUnmarshalCode(C, outParams, ret, p->getMetaData(), _useWstring | TypeContextAMIEnd);
- if(p->returnsClasses())
- {
- C << nl << "__is->readPendingObjects();";
- }
C << nl << "__result->__endReadParams();";
}
else
@@ -2810,10 +2802,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
{
C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();";
writeUnmarshalCode(C, outParams, ret, p->getMetaData(), _useWstring | TypeContextAMIPrivateEnd);
- if(p->returnsClasses())
- {
- C << nl << "__is->readPendingObjects();";
- }
C << nl << "__result->__endReadParams();";
}
else
@@ -3246,10 +3234,6 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
}
}
writeMarshalCode(C, inParams, 0, StringList(), TypeContextInParam);
- if(p->sendsClasses())
- {
- C << nl << "__os->writePendingObjects();";
- }
C << nl << "__og.endWriteParams();";
C << eb;
C << nl << "catch(const ::Ice::LocalException& __ex)";
@@ -3341,10 +3325,6 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
{
C << nl << "::IceInternal::BasicStream* __is = __og.startReadParams();";
writeUnmarshalCode(C, outParams, ret, p->getMetaData());
- if(p->returnsClasses())
- {
- C << nl << "__is->readPendingObjects();";
- }
C << nl << "__og.endReadParams();";
}
else
@@ -4845,10 +4825,6 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();";
writeAllocateCode(C, inParams, 0, StringList(), _useWstring | TypeContextInParam);
writeUnmarshalCode(C, inParams, 0, StringList(), TypeContextInParam);
- if(p->sendsClasses())
- {
- C << nl << "__is->readPendingObjects();";
- }
C << nl << "__inS.endReadParams();";
}
else
@@ -4877,10 +4853,6 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
C << nl << "__os->format(" << formatTypeToString(format) << ");";
}
writeMarshalCode(C, outParams, ret, p->getMetaData());
- if(p->returnsClasses())
- {
- C << nl << "__os->writePendingObjects();";
- }
C << nl << "__inS.__endWriteParams(true);";
}
else
@@ -4917,10 +4889,6 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();";
writeAllocateCode(C, inParams, 0, StringList(), _useWstring | TypeContextInParam);
writeUnmarshalCode(C, inParams, 0, StringList(), TypeContextInParam);
- if(p->sendsClasses())
- {
- C << nl << "__is->readPendingObjects();";
- }
C << nl << "__inS.endReadParams();";
}
else
@@ -6719,10 +6687,6 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
{
writeMarshalUnmarshalCode(C, ret, "__ret", true, "", true, p->getMetaData(), TypeContextInParam);
}
- if(p->returnsClasses())
- {
- C << nl << "__os->writePendingObjects();";
- }
C << nl << "__endWriteParams(true);";
C << eb;
C << nl << "catch(const ::Ice::Exception& __ex)";