Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3533 in orxonox.OLD


Ignore:
Timestamp:
Mar 13, 2005, 11:19:00 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: added some more files to the new destructor-type

Location:
orxonox/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/coord/helper_parent.cc

    r3488 r3533  
    3939   \todo this deconstructor is not jet implemented - do it
    4040*/
    41 HelperParent::~HelperParent () {}
     41HelperParent::~HelperParent ()
     42{
     43  this->destroy();
     44}
    4245
     46
     47/**
     48   \brief destroys all allocated memory
     49*/
     50void HelperParent::destroy(void)
     51{
     52
     53
     54  static_cast<PNode*>(this)->destroy();
     55}

  • orxonox/trunk/src/lib/coord/helper_parent.h

    r3488 r3533  
    1717 public:
    1818  HelperParent ();
    19   ~HelperParent ();
    20 
     19  virtual ~HelperParent ();
     20  void destroy(void);
    2121
    2222};

  • orxonox/trunk/src/lib/coord/null_parent.cc

    r3529 r3533  
    6161NullParent::~NullParent ()
    6262{
     63  this->destroy();
     64}
     65
     66/**
     67   \brief destroys all allocated memory
     68*/
     69void NullParent::destroy(void)
     70{
    6371  //delete singletonRef;
    6472  singletonRef = NULL;
     73
     74  static_cast<PNode*>(this)->destroy();
    6575}
    66 
    6776
    6877

  • orxonox/trunk/src/lib/coord/null_parent.h

    r3488 r3533  
    1616 public:
    1717  static NullParent* getInstance ();
    18   ~NullParent ();
     18  virtual ~NullParent ();
     19  void destroy(void);
    1920 
     21
    2022  static NullParent* singletonRef;
    2123

  • orxonox/trunk/src/track_node.cc

    r3528 r3533  
    6666TrackNode::~TrackNode ()
    6767{
    68   singletonRef = NULL;
     68  this->destroy();
    6969}
    7070
     71/**
     72   \brief destroys the TrackNode and all its alocated memory.
     73*/
     74void TrackNode::destroy(void)
     75{
     76  singletonRef = NULL;
     77 
     78  static_cast<PNode*>(this)->destroy();
     79}

  • orxonox/trunk/src/track_node.h

    r3522 r3533  
    2121 public:
    2222  static TrackNode* getInstance ();
    23   ~TrackNode ();
    24  
     23  virtual ~TrackNode ();
     24  void destroy();
    2525
    2626 private:
Note: See TracChangeset for help on using the changeset viewer.