summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cpp/Gen.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2018-09-19 14:03:48 -0400
committerBernard Normier <bernard@zeroc.com>2018-09-19 14:03:48 -0400
commit3eda9b121a49eabdb95b170c513a2d4d2c788e65 (patch)
tree9981e17d36e649009533e10f01e97b06aa570587 /cpp/src/slice2cpp/Gen.cpp
parentFixed URLs for 3rd party repositories (diff)
downloadice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.tar.bz2
ice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.tar.xz
ice-3eda9b121a49eabdb95b170c513a2d4d2c788e65.zip
Fix Xcode 10 warnings
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 4bdfc7cb498..a3f3dedaf57 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -8311,18 +8311,21 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
if(!amd)
{
- writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
if(p->hasMarshaledResult())
{
C << nl << "inS.setMarshaledResult(";
}
- else if(ret)
- {
- C << nl << retS << " ret = ";
- }
else
{
- C << nl;
+ writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
+ if(ret)
+ {
+ C << nl << retS << " ret = ";
+ }
+ else
+ {
+ C << nl;
+ }
}
C << "this->" << opName << spar << args << epar;