Changeset 6182 for code/branches/presentation2/src/modules/questsystem

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/modules/questsystem

Files:

• QuestManager.cc (modified) (1 diff)
• notifications/NotificationManager.cc (modified) (1 diff)

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);