Changeset 6182

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/presentation2/src

Files:

• libraries/core/ScopedSingletonManager.h (modified) (1 diff)
• libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
• libraries/core/input/KeyDetector.cc (modified) (1 diff)
• modules/questsystem/QuestManager.cc (modified) (1 diff)
• modules/questsystem/notifications/NotificationManager.cc (modified) (1 diff)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (1 diff)
• orxonox/MoodManager.cc (modified) (1 diff)
• orxonox/PlayerManager.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• orxonox/sound/SoundManager.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);
 

code/branches/presentation2/src/modules/questsystem/QuestManager.cc

@@ -55 +55 @@
     DeclareToluaInterface(Questsystem);
 
-    //! Pointer to the current (and single) instance of this class.
-    /*static*/ QuestManager* QuestManager::singletonPtr_s = NULL;
     ManageScopedSingleton(QuestManager, ScopeID::Root, false);
 

code/branches/presentation2/src/modules/questsystem/notifications/NotificationManager.cc

@@ -47 +47 @@
     const std::string NotificationManager::NONE = "none";
 
-    NotificationManager* NotificationManager::singletonPtr_s = NULL;
     ManageScopedSingleton(NotificationManager, ScopeID::Root, false);
 

code/branches/presentation2/src/orxonox/CameraManager.cc

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

code/branches/presentation2/src/orxonox/LevelManager.cc

@@ -44 +44 @@
     SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
 
-    LevelManager* LevelManager::singletonPtr_s = 0;
     ManageScopedSingleton(LevelManager, ScopeID::Root, false);
 

code/branches/presentation2/src/orxonox/MoodManager.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    MoodManager* MoodManager::singletonPtr_s = 0;
     ManageScopedSingleton(MoodManager, ScopeID::Root, false);
 

code/branches/presentation2/src/orxonox/PlayerManager.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    PlayerManager* PlayerManager::singletonPtr_s = 0;
     ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
 

code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc

@@ -61 +61 @@
     SetConsoleCommand(InGameConsole, closeConsole, true);
 
-    InGameConsole* InGameConsole::singletonPtr_s = 0;
     ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
 

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    SoundManager* SoundManager::singletonPtr_s = NULL;
     ManageScopedSingleton(SoundManager, ScopeID::Graphics, true);