Commit cb4a4686 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'clear-generator-data'

00055ce7 cmExportSetMap: Override clear() to delete held resources
parents 4a762aa3 00055ce7
...@@ -23,7 +23,7 @@ cmExportSet* cmExportSetMap::operator[](const std::string &name) ...@@ -23,7 +23,7 @@ cmExportSet* cmExportSetMap::operator[](const std::string &name)
return it->second; return it->second;
} }
cmExportSetMap::~cmExportSetMap() void cmExportSetMap::clear()
{ {
for(std::map<std::string, cmExportSet*>::iterator it = this->begin(); for(std::map<std::string, cmExportSet*>::iterator it = this->begin();
it != this->end(); it != this->end();
...@@ -31,4 +31,10 @@ cmExportSetMap::~cmExportSetMap() ...@@ -31,4 +31,10 @@ cmExportSetMap::~cmExportSetMap()
{ {
delete it->second; delete it->second;
} }
this->derived::clear();
}
cmExportSetMap::~cmExportSetMap()
{
this->clear();
} }
...@@ -18,6 +18,7 @@ class cmExportSet; ...@@ -18,6 +18,7 @@ class cmExportSet;
/// A name -> cmExportSet map with overloaded operator[]. /// A name -> cmExportSet map with overloaded operator[].
class cmExportSetMap : public std::map<std::string, cmExportSet*> class cmExportSetMap : public std::map<std::string, cmExportSet*>
{ {
typedef std::map<std::string, cmExportSet*> derived;
public: public:
/** \brief Overloaded operator[]. /** \brief Overloaded operator[].
* *
...@@ -26,6 +27,8 @@ public: ...@@ -26,6 +27,8 @@ public:
*/ */
cmExportSet* operator[](const std::string &name); cmExportSet* operator[](const std::string &name);
void clear();
/// Overloaded destructor deletes all member export sets. /// Overloaded destructor deletes all member export sets.
~cmExportSetMap(); ~cmExportSetMap();
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment