Changeset 10980

Timestamp:

Dec 27, 2015, 8:36:21 PM (9 years ago)

Author:

landauf

Message:

getHeaderIdentifier(): return the typeid of the actual function pointer instead of FunctorHeaderIdentifier

File:

• code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) (3 diffs)

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

@@ -407 +407 @@
         template <bool isconst, class... Params>                           struct FunctorCaller<void, void, isconst, Params...>        { static inline MultiType call(typename detail::FunctionPointer<void, void, isconst, Params...>::Type functionPointer, void*, const Params&... parameters)  { (*functionPointer)(parameters...); return MultiType::Null; } };
 
-        // Helper class, used to identify the header of a function-pointer (independent of its class)
-        template <class R, class... Params>
-        struct FunctorHeaderIdentifier
-        {};
-
         // Helper class to determine if a function has a returnvalue
         template <class T>
@@ -529 +524 @@
             virtual const std::type_index getHeaderIdentifier() const override
             {
-                return typeid(detail::FunctorHeaderIdentifier<R, Params...>);
+                return typeid(typename detail::FunctionPointer<R, void, false, Params...>::Type);
             }
 
@@ -564 +559 @@
             const std::type_index getTypelistIdentifier(detail::type_list<Types...>) const
             {
-                return typeid(detail::FunctorHeaderIdentifier<R, Types...>);
+                return typeid(typename detail::FunctionPointer<R, void, false, Types...>::Type);
             }
     };