From 0a4e5674eccb0126733086d4632c7239217db6f1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 25 Jan 2015 15:47:21 +0100 Subject: cmMacroCommand: Remove counting variable. Start iteration at correct starting point directly. --- Source/cmMacroCommand.cxx | 13 ++++--------- 1 file 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::const_iterator eit - = expandedArgs.begin(); - std::vector::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; -- cgit v0.12