Changeset 10817 for code/branches/cpp11_v2/src/libraries/core/singleton

Timestamp:

Nov 19, 2015, 11:40:28 AM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

Location:

code/branches/cpp11_v2/src/libraries/core/singleton

Files:

• ScopedSingletonIncludes.h (modified) (1 diff)
• ScopedSingletonWrapper.h (modified) (4 diffs)

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

@@ -87 +87 @@
             ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
 
-            virtual void load();
-            virtual void unload();
+            virtual void load() override;
+            virtual void unload() override;
 
             inline ScopedSingletonWrapper& getWrapper()

code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h

@@ -102 +102 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -109 +109 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             assert(singletonPtr_ != nullptr);
@@ -157 +157 @@
 
         //! Called if the Scope of the Singleton gets active (creates the instance)
-        void activated()
+        void activated() override
         {
             assert(singletonPtr_ == nullptr);
@@ -169 +169 @@
 
         //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
-        void deactivated()
+        void deactivated() override
         {
             if (singletonPtr_ != nullptr)