cmFunctionCommand: Remove counting variable.

Start iteration at correct starting point directly.
This commit is contained in:
Stephen Kelly 2015-02-11 23:31:22 +01:00
parent e5ebeae768
commit fc1cf2654d
1 changed files with 5 additions and 9 deletions

View File

@ -137,18 +137,14 @@ bool cmFunctionHelperCommand::InvokeInitialPass
argvDef += *eit; argvDef += *eit;
} }
std::string argnDef; std::string argnDef;
unsigned int cnt = 0; eit = expandedArgs.begin() + (this->Args.size()-1);
for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit ) for ( ; eit != expandedArgs.end(); ++eit)
if ( cnt >= this->Args.size()-1 )
{
if (!argnDef.empty()) if (!argnDef.empty())
{ {
argnDef += ";"; argnDef += ";";
} }
argnDef += *eit; argnDef += *eit;
} }
cnt ++;
}
this->Makefile->AddDefinition("ARGV", argvDef.c_str()); this->Makefile->AddDefinition("ARGV", argvDef.c_str());
this->Makefile->MarkVariableAsUsed("ARGV"); this->Makefile->MarkVariableAsUsed("ARGV");
this->Makefile->AddDefinition("ARGN", argnDef.c_str()); this->Makefile->AddDefinition("ARGN", argnDef.c_str());