Changeset 10514 for code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

Timestamp:

May 31, 2015, 10:22:59 AM (9 years ago)

Author:

landauf

Message:

don't store scope in ScopeListener - instead register the listener in ScopeManager for a specific scope

File:

• code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -73 +73 @@
     className* className::singletonPtr_s = NULL; \
     static ScopedSingletonWrapper& className##ScopedSingletonWrapper \
-        = (new orxonox::SI_SSW(new ClassScopedSingletonWrapper<className, scope, allowedToFail>(#className)))->getWrapper()
+        = (new orxonox::SI_SSW(new ClassScopedSingletonWrapper<className, allowedToFail>(#className), scope))->getWrapper()
 
 namespace orxonox
@@ -80 +80 @@
     {
         public:
-            StaticallyInitializedScopedSingletonWrapper(ScopedSingletonWrapper* wrapper) : wrapper_(wrapper) {}
+            StaticallyInitializedScopedSingletonWrapper(ScopedSingletonWrapper* wrapper, ScopeID::Value scope)
+                : wrapper_(wrapper)
+                , scope_(scope)
+            {}
 
             virtual void load();
@@ -90 +93 @@
         private:
             ScopedSingletonWrapper* wrapper_;
+            ScopeID::Value scope_;
     };