variable hiding warning fix

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9512 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-11-02 09:40:19 +00:00
commit fe62344fe6

View file

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