diff options
| author | Joe George <joe@zeroc.com> | 2016-02-12 16:27:11 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-02-12 16:30:17 -0500 |
| commit | c7f45aca281068bd27850a7aeb9acad4e1799cab (patch) | |
| tree | 1542242e63c15b1467665bb9cc90934c937d78f4 /cpp | |
| parent | workaround for compiler error in php7 with gcc 4.8 (diff) | |
| download | ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.tar.bz2 ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.tar.xz ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.zip | |
Fix ICE-6987
Change writeOpt to writeOptional and readOpt to readOptional
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Slice/ObjCUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp index 77a4a9af86c..4a542d58b96 100644 --- a/cpp/src/Slice/ObjCUtil.cpp +++ b/cpp/src/Slice/ObjCUtil.cpp @@ -1009,11 +1009,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP out << nl; if(marshal) { - out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];"; + out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];"; } else { - out << "[" << helper << " readOpt:&" << param << " stream:is_ tag:" << tag << "];"; + out << "[" << helper << " readOptional:&" << param << " stream:is_ tag:" << tag << "];"; } return; } @@ -1021,11 +1021,11 @@ Slice::ObjCGenerator::writeOptParamMarshalUnmarshalCode(Output &out, const TypeP out << nl; if(marshal) { - out << "[" << helper << " writeOpt:" << param << " stream:os_ tag:" << tag << "];"; + out << "[" << helper << " writeOptional:" << param << " stream:os_ tag:" << tag << "];"; } else { - out << param << " = [" << helper << " readOpt:is_ tag:" << tag << "];"; + out << param << " = [" << helper << " readOptional:is_ tag:" << tag << "];"; } } |