[Orxonox-commit 3247] r7938 - in code/branches/usability/src/libraries: core tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-20 19:24:04 +0100 (Sun, 20 Feb 2011)
New Revision: 7938

Modified:
   code/branches/usability/src/libraries/core/OrxonoxClass.h
   code/branches/usability/src/libraries/core/WeakPtr.h
   code/branches/usability/src/libraries/tools/ResourceLocation.cc
Log:
Fixed mingw 3 build and removed a warning due to non-virtual destructors.

Modified: code/branches/usability/src/libraries/core/OrxonoxClass.h
===================================================================
--- code/branches/usability/src/libraries/core/OrxonoxClass.h	2011-02-20 17:06:09 UTC (rev 7937)
+++ code/branches/usability/src/libraries/core/OrxonoxClass.h	2011-02-20 18:24:04 UTC (rev 7938)
@@ -193,6 +193,8 @@
         friend class OrxonoxClass;
 
         protected:
+            virtual ~DestructionListener() {}
+
             inline void registerAsDestructionListener(OrxonoxClass* object)
                 { if (object) { object->registerDestructionListener(this); } }
             inline void unregisterAsDestructionListener(OrxonoxClass* object)

Modified: code/branches/usability/src/libraries/core/WeakPtr.h
===================================================================
--- code/branches/usability/src/libraries/core/WeakPtr.h	2011-02-20 17:06:09 UTC (rev 7937)
+++ code/branches/usability/src/libraries/core/WeakPtr.h	2011-02-20 18:24:04 UTC (rev 7938)
@@ -128,7 +128,7 @@
             }
 
             /// Destructor
-            inline ~WeakPtr()
+            inline virtual ~WeakPtr()
             {
                 this->unregisterAsDestructionListener(this->base_);
             }

Modified: code/branches/usability/src/libraries/tools/ResourceLocation.cc
===================================================================
--- code/branches/usability/src/libraries/tools/ResourceLocation.cc	2011-02-20 17:06:09 UTC (rev 7937)
+++ code/branches/usability/src/libraries/tools/ResourceLocation.cc	2011-02-20 18:24:04 UTC (rev 7938)
@@ -29,6 +29,7 @@
 #include "ResourceLocation.h"
 
 #include <OgreResourceGroupManager.h>
+#include <OgreException.h>
 #include <boost/filesystem.hpp>
 
 #include "util/Exception.h"