diff options
| author | Jose <jose@zeroc.com> | 2018-10-16 10:35:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-10-16 10:35:42 +0200 |
| commit | 2767a97cb92f5a1df1558fa0588626b727e108a3 (patch) | |
| tree | c06901ac702f59fbad2fd841e0759c2700b64858 /cpp/src/slice2js/JsUtil.cpp | |
| parent | Fix handling of ServantError (diff) | |
| download | ice-2767a97cb92f5a1df1558fa0588626b727e108a3.tar.bz2 ice-2767a97cb92f5a1df1558fa0588626b727e108a3.tar.xz ice-2767a97cb92f5a1df1558fa0588626b727e108a3.zip | |
Fix slice2js build failure on macOS
Diffstat (limited to 'cpp/src/slice2js/JsUtil.cpp')
| -rw-r--r-- | cpp/src/slice2js/JsUtil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index ec262b7c648..55e47de850b 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -267,7 +267,7 @@ Slice::JsGenerator::fixId(const ContainedPtr& cont) string Slice::JsGenerator::importPrefix(const TypePtr& type, const ContainedPtr& toplevel, - const vector<pair<string, string>>& imports) + const vector<pair<string, string> >& imports) { BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); if(builtin) @@ -310,7 +310,7 @@ Slice::JsGenerator::importPrefix(const TypePtr& type, string Slice::JsGenerator::importPrefix(const ContainedPtr& contained, const ContainedPtr& toplevel, - const vector<pair<string, string>>& imports) + const vector<pair<string, string> >& imports) { string m1 = getModuleMetadata(contained); string m2 = getModuleMetadata(toplevel); @@ -341,9 +341,9 @@ Slice::JsGenerator::importPrefix(const ContainedPtr& contained, if(!p.empty()) { - for (vector<pair<string, string>>::const_iterator i = imports.begin(); i != imports.end(); ++i) + for(vector<pair<string, string> >::const_iterator i = imports.begin(); i != imports.end(); ++i) { - if (i->first == p) + if(i->first == p) { return i->second + "."; } @@ -396,7 +396,7 @@ Slice::JsGenerator::getUnqualified(const string& type, const string& scope, cons string Slice::JsGenerator::typeToString(const TypePtr& type, const ContainedPtr& toplevel, - const vector<pair<string, string>>& imports, + const vector<pair<string, string> >& imports, bool typescript, bool definition) { @@ -597,7 +597,7 @@ Slice::JsGenerator::typeToString(const TypePtr& type, string Slice::JsGenerator::typeToString(const TypePtr& type, const ContainedPtr& toplevel, - const std::vector<std::pair<std::string, std::string>>& imports, + const std::vector<std::pair<std::string, std::string> >& imports, bool typeScript, bool definition, bool usealias) |