diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-10-12 17:20:05 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-10-12 17:20:05 +0200 |
| commit | 62b1f9d4d8483e8637eb18a53922e889fa969e0a (patch) | |
| tree | 1aa04372e6b8ce62d125253086453d308d9f2fbc /cpp/src | |
| parent | Added entry for Windows bindist (diff) | |
| download | ice-3.6.4-xcode9.tar.bz2 ice-3.6.4-xcode9.tar.xz ice-3.6.4-xcode9.zip | |
Fixed generated code warnings showing up with Objective-C and Xcode 9.0 (ICE-8540)v3.6.4-xcode9
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/ObjCUtil.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2objc/Gen.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp index e9001855f06..ab8dca7aa73 100644 --- a/cpp/src/Slice/ObjCUtil.cpp +++ b/cpp/src/Slice/ObjCUtil.cpp @@ -388,7 +388,7 @@ Slice::ObjCGenerator::outTypeToString(const TypePtr& type, bool optional, bool a s += "*"; } } - if(autoreleasing && !isValueType(type)) + if(autoreleasing && (!isValueType(type) || optional)) { s += " ICE_AUTORELEASING_QUALIFIER"; } diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index 80135073987..443f4598c05 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -436,7 +436,7 @@ Slice::ObjCVisitor::getParams(const OperationPtr& op) const string typeString; if((*q)->isOutParam()) { - typeString = outTypeToString(type, (*q)->optional(), false, true); + typeString = outTypeToString(type, (*q)->optional(), true, true); } else { @@ -485,7 +485,7 @@ Slice::ObjCVisitor::getUnmarshalParams(const OperationPtr& op) const { result += " " + getParamId(*q); } - result += ":(" + outTypeToString(type, (*q)->optional(), false, true) + ")" + fixId((*q)->name()); + result += ":(" + outTypeToString(type, (*q)->optional(), true, true) + ")" + fixId((*q)->name()); } } return result; |