Changeset 6182 for code/branches/presentation2/src/libraries

Timestamp:

Nov 30, 2009, 10:44:06 AM (15 years ago)

Author:

rgrieder

Message:

Singleton pointer initialisation should be part of the ManageScopedSingleton macro to ensure the order.

Location:

code/branches/presentation2/src/libraries/core

Files:

• ScopedSingletonManager.h (modified) (1 diff)
• input/KeyBinderManager.cc (modified) (1 diff)
• input/KeyDetector.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h

@@ -39 +39 @@
 
 #define ManageScopedSingleton(className, scope, allowedToFail) \
+    className* className::singletonPtr_s = NULL; \
     static ClassScopedSingletonManager<className, scope, allowedToFail> className##ScopedSingletonManager(#className)
 

code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    KeyBinderManager* KeyBinderManager::singletonPtr_s = 0;
     ManageScopedSingleton(KeyBinderManager, ScopeID::Graphics, false);
 

code/branches/presentation2/src/libraries/core/input/KeyDetector.cc

@@ -39 +39 @@
 {
     std::string KeyDetector::callbackCommand_s = "KeyDetectorKeyPressed";
-    KeyDetector* KeyDetector::singletonPtr_s = 0;
     ManageScopedSingleton(KeyDetector, ScopeID::Graphics, false);