1 files changed, 14 insertions, 12 deletions

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 41f5743e024..ed7d4840d2f 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -29,6 +29,8 @@
 extern FILE* yyin;
 extern int yydebug;
 
+int yyparse();
+
 using namespace std;
 using namespace IceUtil;
 using namespace IceUtilInternal;
@@ -666,19 +668,19 @@ Parser::diffApplication(const list<string>& origArgs)
         StringSeq targets;
         map<string, string> vars;
 
-        vector<string>::const_iterator p = args.begin();
-        string desc = *p++;
+        vector<string>::const_iterator arg = args.begin();
+        string desc = *arg++;
 
-        for(; p != args.end(); ++p)
+        for(; arg != args.end(); ++arg)
         {
-            string::size_type pos = p->find('=');
+            string::size_type pos = arg->find('=');
             if(pos != string::npos)
             {
-                vars[p->substr(0, pos)] = p->substr(pos + 1);
+                vars[arg->substr(0, pos)] = arg->substr(pos + 1);
             }
             else
             {
-                targets.push_back(*p);
+                targets.push_back(*arg);
             }
         }
 
@@ -2476,15 +2478,15 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow,
 
         _session->ice_getConnection()->setAdapter(adapter);
 
-        Ice::Identity id;
+        Ice::Identity ident;
         ostringstream name;
         name << "RemoteLogger-" << loggerCallbackCount++;
-        id.name = name.str();
-        id.category = adminCallbackTemplate->ice_getIdentity().category;
+        ident.name = name.str();
+        ident.category = adminCallbackTemplate->ice_getIdentity().category;
 
         RemoteLoggerIPtr servant = new RemoteLoggerI;
         Ice::RemoteLoggerPrx prx =
-            Ice::RemoteLoggerPrx::uncheckedCast(adapter->add(servant, id));
+            Ice::RemoteLoggerPrx::uncheckedCast(adapter->add(servant, ident));
         adapter->activate();
 
         loggerAdmin->attachRemoteLogger(prx, Ice::LogMessageTypeSeq(), Ice::StringSeq(), tail ? lineCount : -1);
@@ -2871,11 +2873,11 @@ Parser::Parser(const CommunicatorPtr& communicator,
 }
 
 void
-Parser::exception(const Ice::Exception& ex)
+Parser::exception(const Ice::Exception& pex)
 {
     try
     {
-        ex.ice_throw();
+        pex.ice_throw();
     }
     catch(const ApplicationNotExistException& ex)
     {