Changeset 6751

Timestamp:

Apr 17, 2010, 10:04:43 PM (14 years ago)

Author:

rgrieder

Message:

Removed FORCEINLINE from Singleton.h: There seems to be unexpected problems when a Singleton fails to load.

File:

• code/trunk/src/libraries/util/Singleton.h (modified) (3 diffs)

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

@@ -49 +49 @@
     public:
         //! Returns a reference to the singleton instance
-        FORCEINLINE static T& getInstance()
+        static T& getInstance()
         {
             assert(T::singletonPtr_s != NULL);
@@ -56 +56 @@
 
         //! Tells whether the singleton has been created
-        FORCEINLINE static bool exists()
+        static bool exists()
         {
             return (T::singletonPtr_s != NULL);
@@ -62 +62 @@
 
         //! 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: