diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-07-20 12:43:35 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-07-20 12:43:35 -0700 |
| commit | 978edf9b6b427042380c51697adaffd46c247390 (patch) | |
| tree | b17c03b6551e0963c232a92b85d8c634daa6bac2 /cpp/src/slice2java/Gen.cpp | |
| parent | Fix StreamConnector (diff) | |
| download | ice-978edf9b6b427042380c51697adaffd46c247390.tar.bz2 ice-978edf9b6b427042380c51697adaffd46c247390.tar.xz ice-978edf9b6b427042380c51697adaffd46c247390.zip | |
adding more Java optional tests
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index ce6aaff3cbb..ee4f01688d3 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -353,19 +353,20 @@ Slice::JavaVisitor::writeMarshalUnmarshalParams(Output& out, const string& packa { if(checkReturnType && op->returnTag() < (*pli)->tag()) { - writeMarshalUnmarshalCode(out, package, ret, OptionalParam, op->returnTag(), "__ret", marshal, iter, false, - op->getMetaData()); + writeMarshalUnmarshalCode(out, package, ret, OptionalReturnParam, op->returnTag(), "__ret", marshal, iter, + false, op->getMetaData()); checkReturnType = false; } - writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalParam, (*pli)->tag(), + writeMarshalUnmarshalCode(out, package, (*pli)->type(), + (*pli)->isOutParam() ? OptionalOutParam : OptionalInParam, (*pli)->tag(), fixKwd((*pli)->name()), marshal, iter, false, (*pli)->getMetaData()); } if(checkReturnType) { - writeMarshalUnmarshalCode(out, package, ret, OptionalParam, op->returnTag(), "__ret", marshal, iter, false, - op->getMetaData()); + writeMarshalUnmarshalCode(out, package, ret, OptionalReturnParam, op->returnTag(), "__ret", marshal, iter, + false, op->getMetaData()); } } |