Changeset 5867 for code/branches/core5/src/orxonox/CameraManager.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/CameraManager.h (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <list>
 #include "util/OgreForwardRefs.h"
-#include "util/ScopedSingleton.h"
+#include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
 #include "core/SmartPtr.h"
@@ -47 +47 @@
 namespace orxonox
 {
-    class _OrxonoxExport CameraManager : public ScopedSingleton<CameraManager, ScopeID::Graphics>, public OrxonoxClass
+    class _OrxonoxExport CameraManager : public Singleton<CameraManager>, public OrxonoxClass
     {
-            friend class ScopedSingleton<CameraManager, ScopeID::Graphics>;
+            friend class Singleton<CameraManager>;
         public:
             CameraManager();