String constant const-ness changes to placate g++ 4.2.

Also some bug fixes in MIPS ISA uncovered by g++ warnings
(Python string compares don't work in C++!).

--HG--
extra : convert_revision : b347cc0108f23890e9b73b3ee96059f0cea96cf6

1 files changed, 4 insertions, 2 deletions

diff --git a/src/base/inifile.cc b/src/base/inifile.cc
index 4d504d04f..809cbe172 100644
--- a/src/base/inifile.cc
+++ b/src/base/inifile.cc
@@ -111,7 +111,7 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
 
         int arg_count = cppArgs.size();
 
-        char **args = new char *[arg_count + 20];
+        const char **args = new const char *[arg_count + 20];
 
         int nextArg = 0;
         args[nextArg++] = "g++";
@@ -136,7 +136,9 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
         if (dup2(tmp_fd, STDOUT_FILENO) == -1)
             exit(1);
 
-        execvp("g++", args);
+        // execvp signature is intentionally broken wrt const-ness for
+        // backwards compatibility... see man page
+        execvp("g++", const_cast<char * const *>(args));
 
         exit(0);
     }