summaryrefslogtreecommitdiffstats
path: root/Source/cmMacroCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-25 14:47:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-02-11 21:57:38 (GMT)
commit0a4e5674eccb0126733086d4632c7239217db6f1 (patch)
treef19b6f2780a5961535549b48d564791f400d96d5 /Source/cmMacroCommand.cxx
parent11ecc31d0a2da0090195a682364fb4628f55673a (diff)
downloadCMake-0a4e5674eccb0126733086d4632c7239217db6f1.zip
CMake-0a4e5674eccb0126733086d4632c7239217db6f1.tar.gz
CMake-0a4e5674eccb0126733086d4632c7239217db6f1.tar.bz2
cmMacroCommand: Remove counting variable.
Start iteration at correct starting point directly.
Diffstat (limited to 'Source/cmMacroCommand.cxx')
-rw-r--r--Source/cmMacroCommand.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index c1e7cbb..657e750 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -167,19 +167,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
if (expandedArgs.size() > this->Args.size() - 1)
{
std::vector<std::string>::const_iterator eit
- = expandedArgs.begin();
- std::vector<std::string>::size_type cnt = 0;
+ = expandedArgs.begin() + (this->Args.size() - 1);
for( ; eit != expandedArgs.end(); ++eit)
{
- if ( cnt >= this->Args.size()-1 )
+ if (!argnDef.empty())
{
- if (!argnDef.empty())
- {
- argnDef += ";";
- }
- argnDef += *eit;
+ argnDef += ";";
}
- cnt ++;
+ argnDef += *eit;
}
}
argnDefInitialized = true;