summaryrefslogtreecommitdiff
path: root/cpp/src/slice2js/Gen.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-10-16 10:35:42 +0200
committerJose <jose@zeroc.com>2018-10-16 10:35:42 +0200
commit2767a97cb92f5a1df1558fa0588626b727e108a3 (patch)
treec06901ac702f59fbad2fd841e0759c2700b64858 /cpp/src/slice2js/Gen.cpp
parentFix handling of ServantError (diff)
downloadice-2767a97cb92f5a1df1558fa0588626b727e108a3.tar.bz2
ice-2767a97cb92f5a1df1558fa0588626b727e108a3.tar.xz
ice-2767a97cb92f5a1df1558fa0588626b727e108a3.zip
Fix slice2js build failure on macOS
Diffstat (limited to 'cpp/src/slice2js/Gen.cpp')
-rw-r--r--cpp/src/slice2js/Gen.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index be159aa206b..9fd6c3b33a7 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -358,7 +358,7 @@ writeOpDocSummary(Output& out, const OperationPtr& op, const CommentPtr& doc, Op
}
-Slice::JsVisitor::JsVisitor(Output& out, const vector<pair<string, string>>& imports) :
+Slice::JsVisitor::JsVisitor(Output& out, const vector<pair<string, string> >& imports) :
_out(out),
_imports(imports)
{
@@ -368,7 +368,7 @@ Slice::JsVisitor::~JsVisitor()
{
}
-vector<pair<string, string>>
+vector<pair<string, string> >
Slice::JsVisitor::imports() const
{
return _imports;
@@ -2221,7 +2221,7 @@ Slice::Gen::TypeScriptRequireVisitor::addImport(const string& m1, const string&
relpath.erase(pos);
}
- 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 == relpath)
{
@@ -2233,7 +2233,7 @@ Slice::Gen::TypeScriptRequireVisitor::addImport(const string& m1, const string&
}
else if(m1 != m2)
{
- 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 == m1)
{
@@ -2364,7 +2364,7 @@ Slice::Gen::TypeScriptRequireVisitor::visitDictionary(const DictionaryPtr& dict)
void
Slice::Gen::TypeScriptRequireVisitor::writeRequires(const UnitPtr& p)
{
- 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)
{
_out << nl << "import * as " << i->second << " from \"" << i->first << "\"";
}
@@ -2428,7 +2428,7 @@ Slice::Gen::TypeScriptAliasVisitor::addAlias(const string& type, const string& p
{
if(scope.find("." + type.substr(0, i + 1)) != string::npos)
{
- for(vector<pair<string, string>>::const_iterator j = _aliases.begin(); j != _aliases.end(); ++j)
+ for(vector<pair<string, string> >::const_iterator j = _aliases.begin(); j != _aliases.end(); ++j)
{
if(j->first == type)
{
@@ -2554,7 +2554,7 @@ Slice::Gen::TypeScriptAliasVisitor::writeAlias(const UnitPtr& p)
if(!_aliases.empty())
{
_out << sp;
- for(vector<pair<string, string>>::const_iterator i = _aliases.begin(); i != _aliases.end(); ++i)
+ for(vector<pair<string, string> >::const_iterator i = _aliases.begin(); i != _aliases.end(); ++i)
{
_out << nl << "type " << i->second << " = " << i->first << ";";
}
@@ -2562,7 +2562,7 @@ Slice::Gen::TypeScriptAliasVisitor::writeAlias(const UnitPtr& p)
}
Slice::Gen::TypeScriptVisitor::TypeScriptVisitor(::IceUtilInternal::Output& out,
- const vector<pair<string, string>>& imports) :
+ const vector<pair<string, string> >& imports) :
JsVisitor(out, imports)
{
}