Changeset 4980 in orxonox.OLD

Timestamp:

Aug 10, 2005, 4:53:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now also the FastFactories get deleted at the end

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (2 diffs)
• util/fast_factory.cc (modified) (1 diff)
• util/fast_factory.h (modified) (1 diff)

orxonox/trunk/src/orxonox.cc

@@ -43 +43 @@
 
 #include "factory.h"
+#include "fast_factory.h"
+
 #include "benchmark.h"
 
@@ -90 +92 @@
   delete CDEngine::getInstance();
   delete GarbageCollector::getInstance();
+  FastFactory::deleteAll();
 
   delete EventHandler::getInstance();

orxonox/trunk/src/util/fast_factory.cc

@@ -55 +55 @@
   if (this == first)
     this->first = NULL;
+  this->flush();
 
   if (this->next)
     delete this->next;
+}
+
+/**
+ * deletes all FastFactories
+ */
+void FastFactory::deleteAll()
+{
+  if (FastFactory::first)
+    delete FastFactory::first;
 }
 

orxonox/trunk/src/util/fast_factory.h

@@ -53 +53 @@
   public:
     virtual ~FastFactory ();
+    static void deleteAll();
 
     // functions to push and pop elements of this class