[Orxonox-commit 2034] r6751 - code/trunk/src/libraries/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-17 22:04:43 +0200 (Sat, 17 Apr 2010)
New Revision: 6751

Modified:
   code/trunk/src/libraries/util/Singleton.h
Log:
Removed FORCEINLINE from Singleton.h: There seems to be unexpected problems when a Singleton fails to load.

Modified: code/trunk/src/libraries/util/Singleton.h
===================================================================
--- code/trunk/src/libraries/util/Singleton.h	2010-04-17 11:26:59 UTC (rev 6750)
+++ code/trunk/src/libraries/util/Singleton.h	2010-04-17 20:04:43 UTC (rev 6751)
@@ -48,26 +48,26 @@
     {
     public:
         //! Returns a reference to the singleton instance
-        FORCEINLINE static T& getInstance()
+        static T& getInstance()
         {
             assert(T::singletonPtr_s != NULL);
             return *T::singletonPtr_s;
         }
 
         //! Tells whether the singleton has been created
-        FORCEINLINE static bool exists()
+        static bool exists()
         {
             return (T::singletonPtr_s != NULL);
         }
 
         //! Update method called by ClassSingletonManager (if used)
-        FORCEINLINE void preUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->preUpdate(time); }
+        void preUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->preUpdate(time); }
         //! Empty update method for the static polymorphism
-        FORCEINLINE void preUpdate(const Clock& time) { }
+        void preUpdate(const Clock& time) { }
         //! Update method called by ClassSingletonManager (if used)
-        FORCEINLINE void postUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->postUpdate(time); }
+        void postUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->postUpdate(time); }
         //! Empty update method for the static polymorphism
-        FORCEINLINE void postUpdate(const Clock& time) { }
+        void postUpdate(const Clock& time) { }
 
     protected:
         //! Constructor sets the singleton instance pointer