Fix slice2js build failure on macOS

4 files changed, 25 insertions, 27 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)
 {
 }
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index f5bc6216a52..db18bb4fe85 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -20,11 +20,11 @@ class JsVisitor : public JsGenerator, public ParserVisitor
 public:
 
     JsVisitor(::IceUtilInternal::Output&,
-              const std::vector<std::pair<std::string, std::string>>& imports =
-                    std::vector<std::pair<std::string, std::string>>());
+              const std::vector<std::pair<std::string, std::string> >& imports =
+                    std::vector<std::pair<std::string, std::string> >());
     virtual ~JsVisitor();
 
-    std::vector<std::pair<std::string, std::string>> imports() const;
+    std::vector<std::pair<std::string, std::string> > imports() const;
 
 protected:
 
@@ -41,7 +41,7 @@ protected:
 
     ::IceUtilInternal::Output& _out;
 
-    std::vector<std::pair<std::string, std::string>> _imports;
+    std::vector<std::pair<std::string, std::string> > _imports;
 };
 
 class Gen : public JsGenerator
@@ -72,8 +72,6 @@ private:
     std::string _fileBase;
     bool _useStdout;
     bool _typeScript;
-    bool _buildModule;
-    bool _noModule;
 
     class RequireVisitor : public JsVisitor
     {
@@ -195,7 +193,7 @@ private:
         void addAlias(const ExceptionPtr&, const ContainedPtr&);
         void addAlias(const TypePtr&, const ContainedPtr&);
         void addAlias(const std::string&, const std::string&, const ContainedPtr&);
-        std::vector<std::pair<std::string, std::string>> _aliases;
+        std::vector<std::pair<std::string, std::string> > _aliases;
     };
 
     class TypeScriptVisitor : public JsVisitor
@@ -203,7 +201,7 @@ private:
     public:
 
         TypeScriptVisitor(::IceUtilInternal::Output&,
-                          const std::vector<std::pair<std::string, std::string>>&);
+                          const std::vector<std::pair<std::string, std::string> >&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
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)
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index e56162a698d..3991b6651ef 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -32,25 +32,25 @@ public:
     static bool findMetaData(const std::string&, const StringList&, std::string&);
     static std::string importPrefix(const TypePtr&,
                                     const ContainedPtr&,
-                                    const std::vector<std::pair<std::string, std::string>>&);
+                                    const std::vector<std::pair<std::string, std::string> >&);
 
     static std::string importPrefix(const ContainedPtr&,
                                     const ContainedPtr&,
-                                    const std::vector<std::pair<std::string, std::string>>&);
+                                    const std::vector<std::pair<std::string, std::string> >&);
     static std::string importPrefix(const std::string&, const ContainedPtr&);
 
     static std::string getUnqualified(const std::string&, const std::string&, const std::string&);
 
     static std::string typeToString(const TypePtr&,
                                     const ContainedPtr& = 0,
-                                    const std::vector<std::pair<std::string, std::string>>& =
-                                        std::vector<std::pair<std::string, std::string>>(),
+                                    const std::vector<std::pair<std::string, std::string> >& =
+                                        std::vector<std::pair<std::string, std::string> >(),
                                     bool typeScript = false,
                                     bool definition = false);
 
     static std::string typeToString(const TypePtr&,
                                     const ContainedPtr&,
-                                    const std::vector<std::pair<std::string, std::string>>&,
+                                    const std::vector<std::pair<std::string, std::string> >&,
                                     bool typeScript,
                                     bool definition,
                                     bool usealias);