Changeset 10979 for code/branches/cpp11_v2

Timestamp:

Dec 26, 2015, 12:05:20 AM (9 years ago)

Author:

landauf

Message:

gcc doesn't allow an explicit spezialization of a function-template inside a class-template. but we can use function overloading instead of templates.

File:

• code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/command/Functor.h

@@ -305 +305 @@
         protected:
             /// Casts the object and registers as destruction listener if the object is a Destroyable.
-            template<bool = std::is_base_of<Destroyable, O>::value>
-            inline void registerObject(O* object)
-                { this->registerAsDestructionListener(static_cast<Destroyable*>(object)); }
-
-            template<>
-            inline void registerObject<false>(O* object) {}
+            inline void registerObject(Destroyable* object)
+                { this->registerAsDestructionListener(object); }
+
+            inline void registerObject(void* object) {}
 
             /// Casts the object and unregisters as destruction listener if the object is a Destroyable.
-            template<bool = std::is_base_of<Destroyable, O>::value>
-            inline void unregisterObject(O* object)
-                { this->unregisterAsDestructionListener(static_cast<Destroyable*>(object)); }
-
-            template<>
-            inline void unregisterObject<false>(O* object) {}
+            inline void unregisterObject(Destroyable* object)
+                { this->unregisterAsDestructionListener(object); }
+
+            inline void unregisterObject(void* object) {}
 
             /// Will be called by Destroyable::~Destroyable() if the stored object is a Destroyable and deleted and the Functor is in safe mode.