Changeset 10460 for code/branches/core7/src/libraries/core/singleton/Scope.h

Timestamp:

May 24, 2015, 11:19:15 PM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedScopedSingletonWrapper registers ScopedSingletonWrapper in ScopeManager

File:

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

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

@@ -76 +76 @@
         template <ScopeID::Value scope>
         friend class Scope;
-        friend class ScopeListener;
+        friend class StaticallyInitializedScopedSingletonWrapper;
 
         private:
@@ -95 +95 @@
 
         protected:
-            //! Constructor: Registers the instance.
-            ScopeListener(ScopeID::Value scope) : scope_(scope), bActivated_(false)
-                { ScopeManager::getListeners()[this->scope_].insert(this); }
-            //! Destructor: Unregisters the instance.
-            virtual ~ScopeListener()
-                { ScopeManager::getListeners()[this->scope_].erase(this); }
+            ScopeListener(ScopeID::Value scope) : scope_(scope), bActivated_(false) { }
+            virtual ~ScopeListener() { }
 
             //! Gets called if the scope is activated
@@ -106 +102 @@
             //! Gets called if the scope is deactivated
             virtual void deactivated() = 0;
+
+        public:
+            inline ScopeID::Value getScope() const
+                { return this->scope_; }
 
         private: