diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-12-30 14:30:54 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-12-30 14:30:54 -0500 |
| commit | 0a534d9b2068e0531c5edf58f2dd2c706ba647d2 (patch) | |
| tree | 75a404715afa75e1797af02eeaa3a894960d830a /cpp/src | |
| parent | Fixed bugs #3325, #3326 and #3327 (diff) | |
| parent | Fix 3619 - Generated code for IceDelegateM not support gcc NRVO optimization (diff) | |
| download | ice-0a534d9b2068e0531c5edf58f2dd2c706ba647d2.tar.bz2 ice-0a534d9b2068e0531c5edf58f2dd2c706ba647d2.tar.xz ice-0a534d9b2068e0531c5edf58f2dd2c706ba647d2.zip | |
Merge branch 'R3_3_branch' of ssh://git/home/git/ice into R3_3_branch
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0d7747e0879..e06977b4ed0 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2624,6 +2624,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) } C << nl << "bool __ok = __og.invoke();"; + writeAllocateCode(C, ParamDeclList(), ret, p->getMetaData(), _useWstring); if(!p->returnsData()) { C << nl << "if(!__og.is()->b.empty())"; @@ -2687,7 +2688,6 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) C << eb; C << eb; - writeAllocateCode(C, ParamDeclList(), ret, p->getMetaData(), _useWstring); for(ParamDeclList::const_iterator opi = outParams.begin(); opi != outParams.end(); ++opi) { StructPtr st = StructPtr::dynamicCast((*opi)->type()); |