remove memory leaks

This commit is contained in:
Bill Hoffman 2001-09-14 16:26:56 -04:00
parent dd533552bb
commit e197d3f219
6 changed files with 14 additions and 3 deletions

View File

@ -773,6 +773,7 @@ void CMakeSetupDialog::OnOk()
{ {
m_CacheEntriesList.ClearDirty(); m_CacheEntriesList.ClearDirty();
this->RunCMake(true); this->RunCMake(true);
cmMakefileGenerator::UnRegisterGenerators();
CDialog::OnOK(); CDialog::OnOK();
} }

View File

@ -52,7 +52,7 @@ void cmMakefileGenerator::SetMakefile(cmMakefile* mf)
void cmMakefileGenerator::UnRegisterGenerators() void cmMakefileGenerator::UnRegisterGenerators()
{ {
for(std::map<cmStdString, cmMakefileGenerator*>::iterator i for(std::map<cmStdString, cmMakefileGenerator*>::iterator i
= s_RegisteredGenerators.begin(); = s_RegisteredGenerators.begin();
i != s_RegisteredGenerators.end(); ++i) i != s_RegisteredGenerators.end(); ++i)
{ {

View File

@ -131,7 +131,7 @@ inline bool operator==(std::string const& a, const char* b)
{ return (a==std::string(b)); } { return (a==std::string(b)); }
# endif // end CM_SGI_CC_720 # endif // end CM_SGI_CC_720
// use this class to shring the size of symbols in .o files // use this class to shrink the size of symbols in .o files
// std::string is really basic_string<....lots of stuff....> // std::string is really basic_string<....lots of stuff....>
// when combined with a map or set, the symbols can be > 2000 chars! // when combined with a map or set, the symbols can be > 2000 chars!
struct cmStdString : public std::string struct cmStdString : public std::string

View File

@ -53,6 +53,11 @@ cmUnixMakefileGenerator::cmUnixMakefileGenerator()
m_Recurse = false; m_Recurse = false;
} }
cmUnixMakefileGenerator::~cmUnixMakefileGenerator()
{
}
void cmUnixMakefileGenerator::GenerateMakefile() void cmUnixMakefileGenerator::GenerateMakefile()
{ {
// suppoirt override in output directories // suppoirt override in output directories

View File

@ -56,6 +56,8 @@ public:
///! Set cache only and recurse to false by default. ///! Set cache only and recurse to false by default.
cmUnixMakefileGenerator(); cmUnixMakefileGenerator();
~cmUnixMakefileGenerator();
///! Get the name for the generator. ///! Get the name for the generator.
virtual const char* GetName() {return "Unix Makefiles";} virtual const char* GetName() {return "Unix Makefiles";}

View File

@ -1,4 +1,5 @@
#include "cmake.h" #include "cmake.h"
#include "cmMakefileGenerator.h"
int main(int ac, char** av) int main(int ac, char** av)
{ {
@ -8,5 +9,7 @@ int main(int ac, char** av)
{ {
args.push_back(av[i]); args.push_back(av[i]);
} }
return cm.Generate(args); int ret = cm.Generate(args);
cmMakefileGenerator::UnRegisterGenerators();
return ret;
} }