[Orxonox-commit 3211] r7904 - in code/trunk/src: libraries/network libraries/util modules/overlays/hud orxonox/graphics

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-16 22:23:00 +0100 (Wed, 16 Feb 2011)
New Revision: 7904

Modified:
   code/trunk/src/libraries/network/LANDiscoverable.h
   code/trunk/src/libraries/util/Singleton.h
   code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h
   code/trunk/src/orxonox/graphics/ParticleEmitter.h
Log:
2x virtual because it may be required in some cases (Singleton & LANDiscoverable) and 2x for consistency

Modified: code/trunk/src/libraries/network/LANDiscoverable.h
===================================================================
--- code/trunk/src/libraries/network/LANDiscoverable.h	2011-02-16 10:17:30 UTC (rev 7903)
+++ code/trunk/src/libraries/network/LANDiscoverable.h	2011-02-16 21:23:00 UTC (rev 7904)
@@ -33,15 +33,15 @@
 
 namespace orxonox
 {
-  
+
   class LANDiscoverable
   {
     public:
       LANDiscoverable();
-      ~LANDiscoverable();
+      virtual ~LANDiscoverable();
       void setActivity( bool bActive );
       void update();
-      
+
     private:
       bool            bActive_;
       ENetHost*       host_;

Modified: code/trunk/src/libraries/util/Singleton.h
===================================================================
--- code/trunk/src/libraries/util/Singleton.h	2011-02-16 10:17:30 UTC (rev 7903)
+++ code/trunk/src/libraries/util/Singleton.h	2011-02-16 21:23:00 UTC (rev 7904)
@@ -161,7 +161,7 @@
         }
 
         //! Destructor resets the singleton instance pointer
-        ~Singleton()
+        virtual ~Singleton()
         {
             assert(T::singletonPtr_s != NULL);
             T::singletonPtr_s = NULL;

Modified: code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h
===================================================================
--- code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h	2011-02-16 10:17:30 UTC (rev 7903)
+++ code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h	2011-02-16 21:23:00 UTC (rev 7904)
@@ -41,7 +41,7 @@
     {
         public:
             UnderAttackHealthBar(BaseObject* creator);
-            ~UnderAttackHealthBar();
+            virtual ~UnderAttackHealthBar();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void changedOwner();

Modified: code/trunk/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/trunk/src/orxonox/graphics/ParticleEmitter.h	2011-02-16 10:17:30 UTC (rev 7903)
+++ code/trunk/src/orxonox/graphics/ParticleEmitter.h	2011-02-16 21:23:00 UTC (rev 7904)
@@ -40,7 +40,7 @@
     {
         public:
             ParticleEmitter(BaseObject* creator);
-            ~ParticleEmitter();
+            virtual ~ParticleEmitter();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);