Use mcpp instead of icecpp

4 files changed, 17 insertions, 16 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 869042a9734..c1d29884086 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -122,7 +122,7 @@ printCatalogData(const string& dbName, const Freeze::CatalogData& data)
 static int
 run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 {
-    string cppArgs;
+    vector<string> cppArgs;
     bool debug;
     bool ice = true; // Needs to be true in order to create default definitions.
     string outputFile;
@@ -234,7 +234,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("D");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            cppArgs += " -D" + *i;
+            cppArgs.push_back("-D" + *i);
         }
     }
     if(opts.isSet("U"))
@@ -242,7 +242,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("U");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            cppArgs += " -U" + *i;
+            cppArgs.push_back("-U" + *i);
         }
     }
     if(opts.isSet("I"))
@@ -250,7 +250,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("I");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            cppArgs += " -I" + *i;
+            cppArgs.push_back("-I" + *i);
         }
     }
     debug = opts.isSet("debug");
diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp
index b8f5c17cfc8..642f91abe0d 100644
--- a/cpp/src/FreezeScript/Util.cpp
+++ b/cpp/src/FreezeScript/Util.cpp
@@ -169,8 +169,8 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u)
 }
 
 bool
-FreezeScript::parseSlice(const string& n, const Slice::UnitPtr& u, const vector<string>& files, const string& cppArgs,
-                         bool debug)
+FreezeScript::parseSlice(const string& n, const Slice::UnitPtr& u, const vector<string>& files,
+                         const vector<string>& cppArgs, bool debug)
 {
     //
     // Parse the Slice files.
@@ -186,7 +186,7 @@ FreezeScript::parseSlice(const string& n, const Slice::UnitPtr& u, const vector<
             return false;
         }
 
-        int status = u->parse(cppHandle, debug);
+        int status = u->parse(*p, cppHandle, debug);
 
         if(!icecpp.close())
         {
diff --git a/cpp/src/FreezeScript/Util.h b/cpp/src/FreezeScript/Util.h
index fd777c65f40..bbf43764938 100644
--- a/cpp/src/FreezeScript/Util.h
+++ b/cpp/src/FreezeScript/Util.h
@@ -55,7 +55,8 @@ std::string typeName(const Slice::TypePtr&);
 std::string typeToString(const Slice::TypePtr&);
 bool ignoreType(const std::string&);
 void createEvictorSliceTypes(const Slice::UnitPtr&);
-bool parseSlice(const std::string&, const Slice::UnitPtr&, const std::vector<std::string>&, const std::string&, bool);
+bool parseSlice(const std::string&, const Slice::UnitPtr&, const std::vector<std::string>&, 
+                const std::vector<std::string>&, bool);
 
 typedef std::map<std::string, Freeze::CatalogData> CatalogDataMap;
 
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index dbd64cae3ea..467757e5862 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -215,8 +215,8 @@ transformDb(bool evictor,  const Ice::CommunicatorPtr& communicator,
 static int
 run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
 {
-    string oldCppArgs;
-    string newCppArgs;
+    vector<string> oldCppArgs;
+    vector<string> newCppArgs;
     bool debug;
     bool ice = true; // Needs to be true in order to create default definitions.
     string outputFile;
@@ -283,8 +283,8 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("D");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            oldCppArgs += " -D" + *i;
-            newCppArgs += " -D" + *i;
+            oldCppArgs.push_back("-D" + *i);
+            newCppArgs.push_back("-D" + *i);
         }
     }
     if(opts.isSet("U"))
@@ -292,8 +292,8 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("U");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            oldCppArgs += " -U" + *i;
-            newCppArgs += " -U" + *i;
+            oldCppArgs.push_back("-U" + *i);
+            newCppArgs.push_back("-U" + *i);
         }
     }
     debug = opts.isSet("debug");
@@ -315,7 +315,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("include-old");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            oldCppArgs += " -I" + *i;
+            oldCppArgs.push_back("-I" + *i);
         }
     }
     if(opts.isSet("include-new"))
@@ -323,7 +323,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
         vector<string> optargs = opts.argVec("include-new");
         for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
         {
-            newCppArgs += " -I" + *i;
+            newCppArgs.push_back("-I" + *i);
         }
     }
     if(opts.isSet("old"))