kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand.

Browse Source 
Avoid repeatedly looping over the indices to process elements (even
without breaking out of the loop when the element is found).
This commit is contained in:
Stephen Kelly 2015-02-15 15:23:43 +01:00
parent 0b5cf0dabd
commit 6a22e40147
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmListCommand.cxx
View File

@ -527,26 +527,19 @@ bool cmListCommand::HandleRemoveAtCommand(
removed.push_back(static_cast<size_t>(item)); removed.push_back(static_cast<size_t>(item));
} }
std::sort(removed.begin(), removed.end());
removed.erase(std::unique(removed.begin(), removed.end()), removed.end());
varArgsExpanded.erase(cmRemoveIndices(varArgsExpanded, removed),
varArgsExpanded.end());
std::string value; std::string value;
const char* sep = ""; const char* sep = "";
for ( cc = 0; cc < varArgsExpanded.size(); ++ cc ) for ( cc = 0; cc < varArgsExpanded.size(); ++ cc )
{ {
size_t kk; value += sep;
bool found = false; value += varArgsExpanded[cc];
for ( kk = 0; kk < removed.size(); ++ kk ) sep = ";";
{
if ( cc == removed[kk] )
{
found = true;
}
}
if ( !found )
{
value += sep;
value += varArgsExpanded[cc];
sep = ";";
}
} }
this->Makefile->AddDefinition(listName, value.c_str()); this->Makefile->AddDefinition(listName, value.c_str());