diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:17:54 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:17:54 +0200 |
| commit | 44e2e0e70a84afe351a281b68843e140ddc4fc91 (patch) | |
| tree | 0079a3d9061bb5845b6ce8aaa995e710c55df600 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Moved some MX classes to IceInternal (diff) | |
| parent | Python support for optionals (diff) | |
| download | ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.tar.bz2 ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.tar.xz ice-44e2e0e70a84afe351a281b68843e140ddc4fc91.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
py/python/Ice.py
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index c14476148c2..9eaed2ebcc5 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -310,6 +310,11 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper writeMarshalUnmarshalCode(out, (*p)->type(), true, (*p)->tag(), fixKwd((*p)->name()), marshal, (*p)->getMetaData(), typeCtx); } + if(checkReturnType) + { + writeMarshalUnmarshalCode(out, op->returnType(), true, op->returnTag(), "__ret", marshal, op->getMetaData(), + typeCtx); + } } } |