Moved Registry::DeleteContents to Registry::~Registry.

davyw · davyw · commit a9173c8b419f · 2012-04-05T20:40:02.000+02:00
* DeleteContents was only called for _headerRegistry, not for the Schema
  Registry, by moving it to the destructor this fixes a number of memory
  leaks.
diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc
@@ -43,8 +43,6 @@ STEPfile::STEPfile( Registry & r, InstMgr & i, const std::string filename, bool
 STEPfile::~STEPfile() {
     delete _currentDir;
 
-    // remove everything from the Registry before deleting it
-    _headerRegistry->DeleteContents();
     delete _headerRegistry;
 
     _headerInstances->DeleteInstances();
diff --git a/src/clstepcore/Registry.h b/src/clstepcore/Registry.h
@@ -35,7 +35,7 @@ class SCL_CORE_EXPORT Registry {
             all_ents_cnt;
         HashEntry    cur_entity;
         HashEntry    cur_schema;
-        HashEntry   cur_type;
+        HashEntry    cur_type;
 
         // used by AddEntity() and RemoveEntity() to deal with renamings of an
         // entity done in a USE or REFERENCE clause - see header comments in
diff --git a/src/clstepcore/Registry.inline.cc b/src/clstepcore/Registry.inline.cc
@@ -68,6 +68,7 @@ Registry::Registry( CF_init initFunct )
 }
 
 Registry::~Registry() {
+    DeleteContents();
     HASHdestroy( primordialSwamp );
     HASHdestroy( active_schemas );
     HASHdestroy( active_types );

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ Registry::Registry( CF_init initFunct )`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`Registry::~Registry() {`
	`71`	`+ DeleteContents();`
`71`	`72`	`HASHdestroy( primordialSwamp );`
`72`	`73`	`HASHdestroy( active_schemas );`
`73`	`74`	`HASHdestroy( active_types );`