diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-04-21 12:57:45 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-04-21 12:57:45 -0700 |
| commit | d873f0afd752c707b7fe50c217c643ab4b8cdb18 (patch) | |
| tree | 6323aa9486b181d0d2dc677f85a213029748650f /cpp/src/slice2js | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.tar.bz2 ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.tar.xz ice-d873f0afd752c707b7fe50c217c643ab4b8cdb18.zip | |
ICE-6861 - JavaScript stream changes
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/JsUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index b9974214af3..d5db59666b5 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -598,11 +598,11 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, { if(marshal) { - out << nl << stream << ".writeOptObject(" << tag << ", " << param << ");"; + out << nl << stream << ".writeOptionalObject(" << tag << ", " << param << ");"; } else { - out << nl << stream << ".readOptObject(" << tag << ", function(__o){ " << fixSuffix(param) + out << nl << stream << ".readOptionalObject(" << tag << ", function(__o){ " << fixSuffix(param) << " = __o; }, " << typeToString(type) << ");"; } return; @@ -623,11 +623,11 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, if(marshal) { - out << nl << getHelper(type) <<".writeOpt(" << stream << ", " << tag << ", " << param << ");"; + out << nl << getHelper(type) <<".writeOptional(" << stream << ", " << tag << ", " << param << ");"; } else { - out << nl << param << " = " << getHelper(type) << ".readOpt(" << stream << ", " << tag << ");"; + out << nl << param << " = " << getHelper(type) << ".readOptional(" << stream << ", " << tag << ");"; } } |