diff options
| author | Michi Henning <michi@zeroc.com> | 2007-09-06 17:03:02 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-09-06 17:03:02 +1000 |
| commit | 7687c76203f6314bdcffef30fa38ee844fe35781 (patch) | |
| tree | 804d2d3fbaa6345a3bab59bd22e879625f0af20a /cpp/src/Slice/CsUtil.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-7687c76203f6314bdcffef30fa38ee844fe35781.tar.bz2 ice-7687c76203f6314bdcffef30fa38ee844fe35781.tar.xz ice-7687c76203f6314bdcffef30fa38ee844fe35781.zip | |
Refactored DictionaryBase.
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 0771ab3b183..0abaea9d9fe 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -186,7 +186,7 @@ Slice::CsGenerator::typeToString(const TypePtr& type) DictionaryPtr d = DictionaryPtr::dynamicCast(type); if(d) { - if(!d->hasMetaData("clr:DictionaryBase")) + if(!d->hasMetaData("clr:collection")) { return "_System.Collections.Generic.Dictionary<" + typeToString(d->keyType()) + ", " + typeToString(d->valueType()) + ">"; @@ -556,7 +556,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, DictionaryPtr d = DictionaryPtr::dynamicCast(type); if(d) { - if(!d->hasMetaData("clr:DictionaryBase")) + if(!d->hasMetaData("clr:collection")) { typeS = fixId(d->scoped()); } @@ -1271,7 +1271,7 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) } else if(DictionaryPtr::dynamicCast(cont)) { - if(s.substr(prefix.size()) == "DictionaryBase") + if(s.substr(prefix.size()) == "collection") { continue; } |