diff options
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 9d9d59b8ae5..7d2240ca82e 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -5004,7 +5004,7 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin if(s.find(prefix) == 0) { string ss = s.substr(prefix.size()); - if(ss.find("type:wstring") == 0) + if(ss.find("type:wstring") == 0 || ss.find("type:string") == 0) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(cont); ModulePtr module = ModulePtr::dynamicCast(cont); @@ -5034,10 +5034,14 @@ bool Slice::Gen::setUseWstring(ContainedPtr p, list<bool>& hist, bool use) { hist.push_back(use); - if(!use) + StringList metaData = p->getMetaData(); + if(find(metaData.begin(), metaData.end(), "cpp:type:wstring") != metaData.end()) + { + use = true; + } + else if(find(metaData.begin(), metaData.end(), "cpp:type:string") != metaData.end()) { - StringList metaData = p->getMetaData(); - use = find(metaData.begin(), metaData.end(), "cpp:type:wstring") != metaData.end(); + use = false; } return use; } |