Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4980 in orxonox.OLD for orxonox/trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/orxonox.cc

    r4975 r4980  
    4343
    4444#include "factory.h"
     45#include "fast_factory.h"
     46
    4547#include "benchmark.h"
    4648
     
    9092  delete CDEngine::getInstance();
    9193  delete GarbageCollector::getInstance();
     94  FastFactory::deleteAll();
    9295
    9396  delete EventHandler::getInstance();
  • orxonox/trunk/src/util/fast_factory.cc

    r4979 r4980  
    5555  if (this == first)
    5656    this->first = NULL;
     57  this->flush();
    5758
    5859  if (this->next)
    5960    delete this->next;
     61}
     62
     63/**
     64 * deletes all FastFactories
     65 */
     66void FastFactory::deleteAll()
     67{
     68  if (FastFactory::first)
     69    delete FastFactory::first;
    6070}
    6171
  • orxonox/trunk/src/util/fast_factory.h

    r4979 r4980  
    5353  public:
    5454    virtual ~FastFactory ();
     55    static void deleteAll();
    5556
    5657    // functions to push and pop elements of this class
Note: See TracChangeset for help on using the changeset viewer.