diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/FreezeScript/Util.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 36 |
2 files changed, 7 insertions, 43 deletions
diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp index 2d5a355f7cb..5163e0a2a96 100644 --- a/cpp/src/FreezeScript/Util.cpp +++ b/cpp/src/FreezeScript/Util.cpp @@ -90,8 +90,8 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u) { identity = ice->createStruct("Identity", false); Slice::TypePtr str = u->builtin(Slice::Builtin::KindString); - identity->createDataMember("name", str, 0, "", ""); - identity->createDataMember("category", str, 0, "", ""); + identity->createDataMember("name", str, false, 0, 0, "", ""); + identity->createDataMember("category", str, false, 0, 0, "", ""); } else { @@ -132,9 +132,9 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u) { stats = freeze->createStruct("Statistics", false); Slice::TypePtr tl = u->builtin(Slice::Builtin::KindLong); - stats->createDataMember("creationTime", tl, 0, "", ""); - stats->createDataMember("lastSaveTime", tl, 0, "", ""); - stats->createDataMember("avgSaveTime", tl, 0, "", ""); + stats->createDataMember("creationTime", tl, false, 0, 0, "", ""); + stats->createDataMember("lastSaveTime", tl, false, 0, 0, "", ""); + stats->createDataMember("avgSaveTime", tl, false, 0, 0, "", ""); } else { @@ -155,8 +155,8 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u) { Slice::StructPtr rec = freeze->createStruct("ObjectRecord", false); Slice::TypePtr obj = u->builtin(Slice::Builtin::KindObject); - rec->createDataMember("servant", obj, 0, "", ""); - rec->createDataMember("stats", stats, 0, "", ""); + rec->createDataMember("servant", obj, false, 0, 0, "", ""); + rec->createDataMember("stats", stats, false, 0, 0, "", ""); } else { 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)"; |