diff options
| author | Jose <jose@zeroc.com> | 2018-10-23 15:10:49 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-10-23 15:15:55 +0200 |
| commit | ff2b0065aa7de98adb50d15d8b4e999f56b1a06d (patch) | |
| tree | dc47e5e90e49034f17bc1b8a7999b27293af72ac /cpp/src/slice2matlab/Main.cpp | |
| parent | Fixed IceGrid bug in the algorithm to find Query objects, fixes #255 (diff) | |
| download | ice-ff2b0065aa7de98adb50d15d8b4e999f56b1a06d.tar.bz2 ice-ff2b0065aa7de98adb50d15d8b4e999f56b1a06d.tar.xz ice-ff2b0065aa7de98adb50d15d8b4e999f56b1a06d.zip | |
Fixed slice2matlab generated code type for dictionary data members
Close #256
Diffstat (limited to 'cpp/src/slice2matlab/Main.cpp')
| -rw-r--r-- | cpp/src/slice2matlab/Main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp index 051e37b76ac..c673feb482b 100644 --- a/cpp/src/slice2matlab/Main.cpp +++ b/cpp/src/slice2matlab/Main.cpp @@ -362,7 +362,11 @@ typeToString(const TypePtr& type) DictionaryPtr dict = DictionaryPtr::dynamicCast(type); if(dict) { - if(!StructPtr::dynamicCast(dict->keyType())) + if(StructPtr::dynamicCast(dict->keyType())) + { + return "struct"; + } + else { return "containers.Map"; } @@ -3599,7 +3603,7 @@ CodeVisitor::visitDictionary(const DictionaryPtr& p) if(cls || convert) { - out << nl << "function r = convert(d, obj)"; + out << nl << "function r = convert(d)"; out.inc(); if(st) { |