From fe62344fe6a42e1e3331aa4274e18a44c9bd29cd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Nov 2006 09:40:19 +0000
Subject: [PATCH] variable hiding warning fix

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9512 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/r.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index 4a0b65b0a..bd11a01c5 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -444,8 +444,8 @@ protected:
   
   // Store a copy of the command line. 
   // Need only keep a string that has it formatted. 
-  char **argv;
-  int    argc;
+  char **Argv;
+  int    Argc;
   bool inCPlusMode;
   
   // State variables that we remember from the command line settings
@@ -2883,8 +2883,8 @@ void R::main(int argc, char *argv[]) {
   outputNamespaceInfo = false;
   noInitializationCode = false;
 
-  this->argc = argc;
-  this->argv = argv;
+  this->Argc = argc;
+  this->Argv = argv;
 
   allow_overloading();// can we support this?    
 
@@ -2955,16 +2955,16 @@ void R::main(int argc, char *argv[]) {
 */
 int R::outputCommandLineArguments(File *out)
 {
-  if(argc < 1 || !argv || !argv[0])
+  if(Argc < 1 || !Argv || !Argv[0])
     return(-1);
 
   Printf(out, "##   Generated via the command line invocation:\n##\t");
-  for(int i = 0; i < argc ; i++) {
-    Printf(out, " %s", argv[i]);
+  for(int i = 0; i < Argc ; i++) {
+    Printf(out, " %s", Argv[i]);
   }
   Printf(out, "\n\n\n");
 
-  return argc;
+  return Argc;
 }