Changeset 7904

Timestamp:

Feb 16, 2011, 10:23:00 PM (13 years ago)

Author:

landauf

Message:

2x virtual because it may be required in some cases (Singleton & LANDiscoverable) and 2x for consistency

Location:

code/trunk/src

Files:

• libraries/network/LANDiscoverable.h (modified) (1 diff)
• libraries/util/Singleton.h (modified) (1 diff)
• modules/overlays/hud/UnderAttackHealthBar.h (modified) (1 diff)
• orxonox/graphics/ParticleEmitter.h (modified) (1 diff)

code/trunk/src/libraries/network/LANDiscoverable.h

@@ -34 +34 @@
 namespace orxonox
 {
-  
+
   class LANDiscoverable
   {
     public:
       LANDiscoverable();
-      ~LANDiscoverable();
+      virtual ~LANDiscoverable();
       void setActivity( bool bActive );
       void update();
-      
+
     private:
       bool            bActive_;

code/trunk/src/libraries/util/Singleton.h

@@ -162 +162 @@
 
         //! Destructor resets the singleton instance pointer
-        ~Singleton()
+        virtual ~Singleton()
         {
             assert(T::singletonPtr_s != NULL);

code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h

@@ -42 +42 @@
         public:
             UnderAttackHealthBar(BaseObject* creator);
-            ~UnderAttackHealthBar();
+            virtual ~UnderAttackHealthBar();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

code/trunk/src/orxonox/graphics/ParticleEmitter.h

@@ -41 +41 @@
         public:
             ParticleEmitter(BaseObject* creator);
-            ~ParticleEmitter();
+            virtual ~ParticleEmitter();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);