diff options
| author | Jose <jose@zeroc.com> | 2018-06-11 09:56:25 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-06-11 09:56:25 +0200 |
| commit | c2a0a50dd26ab41229e18700ba35d1330b93be30 (patch) | |
| tree | 3bf764fb8c52e3cced736a59794f901ae7f969b9 /cpp/src/slice2js | |
| parent | JS: fix Ice/stream test failure (diff) | |
| download | ice-c2a0a50dd26ab41229e18700ba35d1330b93be30.tar.bz2 ice-c2a0a50dd26ab41229e18700ba35d1330b93be30.tar.xz ice-c2a0a50dd26ab41229e18700ba35d1330b93be30.zip | |
npm-slice2js build failure
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 804e3d5ee32..2862cdc254a 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -1424,11 +1424,11 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p) << "\"" << getHelper(type) << "\"" << ", " << (fixed ? "true" : "false"); if(isClassType(type)) { - bool interface = + bool isinterface = ClassDeclPtr::dynamicCast(type) && ClassDeclPtr::dynamicCast(type)->definition() && ClassDeclPtr::dynamicCast(type)->definition()->isInterface(); - _out<< ", \"" << (interface ? "Ice.Value" : typeToString(type)) << "\""; + _out<< ", \"" << (isinterface ? "Ice.Value" : typeToString(type)) << "\""; } _out << ");"; } @@ -1696,7 +1696,7 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p) const string propertyName = name + "Helper"; bool fixed = !keyType->isVariableLength() && !valueType->isVariableLength(); - bool interface = + bool isinterface = ClassDeclPtr::dynamicCast(valueType) && ClassDeclPtr::dynamicCast(valueType)->definition() && ClassDeclPtr::dynamicCast(valueType)->definition()->isInterface(); @@ -1704,7 +1704,7 @@ Slice::Gen::TypesVisitor::visitDictionary(const DictionaryPtr& p) _out << sp; _out << nl << "Slice.defineDictionary(" << scope << ", \"" << name << "\", \"" << propertyName << "\", " << "\"" << getHelper(keyType) << "\", " - << "\"" << (interface ? "Ice.Value" : getHelper(valueType)) << "\", " + << "\"" << (isinterface ? "Ice.Value" : getHelper(valueType)) << "\", " << (fixed ? "true" : "false") << ", " << (keyUseEquals ? "Ice.HashMap.compareEquals" : "undefined"); |