Use the cmDeleteAll algorithm for types derived from std::map.
This commit is contained in:
parent
4dc0c488f9
commit
681d965df1
|
@ -25,12 +25,7 @@ cmExportSet* cmExportSetMap::operator[](const std::string &name)
|
||||||
|
|
||||||
void cmExportSetMap::clear()
|
void cmExportSetMap::clear()
|
||||||
{
|
{
|
||||||
for(std::map<std::string, cmExportSet*>::iterator it = this->begin();
|
cmDeleteAll(*this);
|
||||||
it != this->end();
|
|
||||||
++ it)
|
|
||||||
{
|
|
||||||
delete it->second;
|
|
||||||
}
|
|
||||||
this->derived::clear();
|
this->derived::clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1510,11 +1510,7 @@ void cmGlobalGenerator::CreateGeneratorTargets()
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmGlobalGenerator::ClearGeneratorMembers()
|
void cmGlobalGenerator::ClearGeneratorMembers()
|
||||||
{
|
{
|
||||||
for(cmGeneratorTargetsType::iterator i = this->GeneratorTargets.begin();
|
cmDeleteAll(this->GeneratorTargets);
|
||||||
i != this->GeneratorTargets.end(); ++i)
|
|
||||||
{
|
|
||||||
delete i->second;
|
|
||||||
}
|
|
||||||
this->GeneratorTargets.clear();
|
this->GeneratorTargets.clear();
|
||||||
|
|
||||||
cmDeleteAll(this->EvaluationFiles);
|
cmDeleteAll(this->EvaluationFiles);
|
||||||
|
|
|
@ -539,12 +539,7 @@ void cmTarget::ClearLinkMaps()
|
||||||
this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear();
|
this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear();
|
||||||
this->Internal->LinkClosureMap.clear();
|
this->Internal->LinkClosureMap.clear();
|
||||||
this->Internal->SourceFilesMap.clear();
|
this->Internal->SourceFilesMap.clear();
|
||||||
for (cmTargetLinkInformationMap::const_iterator it
|
cmDeleteAll(this->LinkInformation);
|
||||||
= this->LinkInformation.begin();
|
|
||||||
it != this->LinkInformation.end(); ++it)
|
|
||||||
{
|
|
||||||
delete it->second;
|
|
||||||
}
|
|
||||||
this->LinkInformation.clear();
|
this->LinkInformation.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6874,10 +6869,7 @@ cmTargetLinkInformationMap
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
cmTargetLinkInformationMap::~cmTargetLinkInformationMap()
|
cmTargetLinkInformationMap::~cmTargetLinkInformationMap()
|
||||||
{
|
{
|
||||||
for(derived::iterator i = this->begin(); i != this->end(); ++i)
|
cmDeleteAll(*this);
|
||||||
{
|
|
||||||
delete i->second;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue