Changeset 7904 for code/trunk/src/libraries

Timestamp:

Feb 16, 2011, 10:23:00 PM (14 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/libraries

Files:

• network/LANDiscoverable.h (modified) (1 diff)
• util/Singleton.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);