Changeset 5867 for code/branches/core5/src/orxonox/PlayerManager.h

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

File:

• code/branches/core5/src/orxonox/PlayerManager.h (modified) (1 diff)

code/branches/core5/src/orxonox/PlayerManager.h

@@ -34 +34 @@
 #include <cassert>
 #include <map>
-#include "util/ScopedSingleton.h"
+#include "util/Singleton.h"
 #include "network/ClientConnectionListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PlayerManager : public ScopedSingleton<PlayerManager, ScopeID::Root>, public ClientConnectionListener
+    class _OrxonoxExport PlayerManager : public Singleton<PlayerManager>, public ClientConnectionListener
     {
-            friend class ScopedSingleton<PlayerManager, ScopeID::Root>;
+            friend class Singleton<PlayerManager>;
         public:
             PlayerManager();