Enforce const-ness of command line arguments; bug fix in mosesserver.cpp.

1 files changed, 6 insertions, 5 deletions

diff --git a/misc/prunePhraseTable.cpp b/misc/prunePhraseTable.cpp
index f6d608bc6..f8ab1084d 100644
--- a/misc/prunePhraseTable.cpp
+++ b/misc/prunePhraseTable.cpp
@@ -53,7 +53,7 @@ using namespace std;
 namespace po = boost::program_options;
 typedef multimap<float,string> Lines;
 
-static void usage(const po::options_description& desc, char** argv)
+static void usage(const po::options_description& desc, char const** argv)
 {
   cerr << "Usage: " + string(argv[0]) +  " [options] input-file output-file" << endl;
   cerr << desc << endl;
@@ -94,7 +94,7 @@ static void outputTopN(const Phrase& sourcePhrase, const multimap<float,const Ta
       out << endl;
     }
 }*/
-int main(int argc, char** argv)
+int main(int argc, char const** argv)
 {
   bool help;
   string input_file;
@@ -138,10 +138,11 @@ int main(int argc, char** argv)
   mosesargs.push_back(config_file);
 
   boost::scoped_ptr<Parameter> params(new Parameter());
-  char** mosesargv = new char*[mosesargs.size()];
+  char const** mosesargv = new char const*[mosesargs.size()];
   for (size_t i = 0; i < mosesargs.size(); ++i) {
-    mosesargv[i] = new char[mosesargs[i].length() + 1];
-    strcpy(mosesargv[i], mosesargs[i].c_str());
+    mosesargv[i] = mosesargs[i].c_str();
+    // mosesargv[i] = new char[mosesargs[i].length() + 1];
+    // strcpy(mosesargv[i], mosesargs[i].c_str());
   }
 
   if (!params->LoadParam(mosesargs.size(), mosesargv)) {