Changeset 11071 for code/trunk/src/libraries/core/singleton

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/singleton/Scope.h (modified) (1 diff)
• src/libraries/core/singleton/ScopeManager.cc (modified) (2 diffs)
• src/libraries/core/singleton/ScopeManager.h (modified) (1 diff)
• src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) (2 diffs)
• src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) (6 diffs)

code/trunk/src/libraries/core/singleton/Scope.h

@@ -72 +72 @@
         protected:
             ScopeListener() : bActivated_(false) { }
-            virtual ~ScopeListener() { }
+            virtual ~ScopeListener() = default;
 
             //! Gets called if the scope is activated

code/trunk/src/libraries/core/singleton/ScopeManager.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    ScopeManager* ScopeManager::singletonPtr_s = 0;
+    ScopeManager* ScopeManager::singletonPtr_s = nullptr;
 
     void ScopeManager::addScope(ScopeID::Value scope)
@@ -73 +73 @@
     void ScopeManager::activateListenersForScope(ScopeID::Value scope)
     {
-        for (std::set<ScopeListener*>::iterator it = this->listeners_[scope].begin(); it != this->listeners_[scope].end(); ++it)
-            this->activateListener(*it);
+        for (ScopeListener* listener : this->listeners_[scope])
+            this->activateListener(listener);
     }
 
     void ScopeManager::deactivateListenersForScope(ScopeID::Value scope)
     {
-        for (std::set<ScopeListener*>::iterator it = this->listeners_[scope].begin(); it != this->listeners_[scope].end(); ++it)
-            this->deactivateListener(*it);
+        for (ScopeListener* listener : this->listeners_[scope])
+            this->deactivateListener(listener);
     }
 

code/trunk/src/libraries/core/singleton/ScopeManager.h

@@ -83 +83 @@
 
             std::set<ScopeID::Value> activeScopes_;
-            std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_; //!< Stores all listeners for a scope
+            std::map<ScopeID::Value, std::set<ScopeListener*>> listeners_; //!< Stores all listeners for a scope
 
             static ScopeManager* singletonPtr_s;

code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -71 +71 @@
 */
 #define ManageScopedSingleton(className, scope, allowedToFail) \
-    className* className::singletonPtr_s = NULL; \
+    className* className::singletonPtr_s = nullptr; \
     static ScopedSingletonWrapper& className##ScopedSingletonWrapper \
         = (new orxonox::SI_SSW(new ClassScopedSingletonWrapper<className, allowedToFail>(#className), scope))->getWrapper()
@@ -87 +87 @@
             ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ScopedSingletonWrapper& getWrapper()

code/trunk/src/libraries/core/singleton/ScopedSingletonWrapper.h

@@ -64 +64 @@
                 : className_(className)
             { }
-            virtual ~ScopedSingletonWrapper() { }
+            virtual ~ScopedSingletonWrapper() = default;
 
         protected:
@@ -91 +91 @@
         ClassScopedSingletonWrapper(const std::string& className)
             : ScopedSingletonWrapper(className)
-            , singletonPtr_(NULL)
+            , singletonPtr_(nullptr)
         {
         }
@@ -102 +102 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        virtual void activated() override
         {
-            assert(singletonPtr_ == NULL);
+            assert(singletonPtr_ == nullptr);
             singletonPtr_ = new T();
         }
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        virtual void deactivated() override
         {
-            assert(singletonPtr_ != NULL);
+            assert(singletonPtr_ != nullptr);
             this->destroy(singletonPtr_);
-            singletonPtr_ = NULL;
+            singletonPtr_ = nullptr;
         }
 
@@ -146 +146 @@
         ClassScopedSingletonWrapper(const std::string& className)
             : ScopedSingletonWrapper(className)
-            , singletonPtr_(NULL)
+            , singletonPtr_(nullptr)
         {
         }
@@ -157 +157 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        virtual void activated() override
         {
-            assert(singletonPtr_ == NULL);
+            assert(singletonPtr_ == nullptr);
             try
                 { singletonPtr_ = new T(); }
@@ -169 +169 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        virtual void deactivated() override
         {
-            if (singletonPtr_ != NULL)
+            if (singletonPtr_ != nullptr)
             {
                 this->destroy(singletonPtr_);
-                singletonPtr_ = NULL;
+                singletonPtr_ = nullptr;
             }
         }