Changeset 10982 for code/branches/cpp11_v2

Timestamp:

Dec 27, 2015, 11:07:37 PM (9 years ago)

Author:

landauf

Message:

now it's again possible to use std::type_info instead of type_index

File:

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

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

@@ -117 +117 @@
 
 #include <array>
-#include <typeindex>
-#include <type_traits>
 #include <tuple>
 
@@ -222 +220 @@
 
             /// Returns the full identifier of the function-pointer which is defined as typeid(@a F), where @a F is the type of the stored function-pointer. Used to compare functors.
-            virtual const std::type_index getFullIdentifier() const = 0;
+            virtual const std::type_info& getFullIdentifier() const = 0;
             /// Returns an identifier of the header of the function (doesn't include the function's class). Used to compare functors.
-            virtual const std::type_index getHeaderIdentifier() const = 0;
+            virtual const std::type_info& getHeaderIdentifier() const = 0;
             /// Returns an identifier of the header of the function (doesn't include the function's class), but regards only the first @a params parameters. Used to compare functions if an Executor provides default-values for the other parameters.
-            virtual const std::type_index getHeaderIdentifier(unsigned int params) const = 0;
+            virtual const std::type_info& getHeaderIdentifier(unsigned int params) const = 0;
     };
 
@@ -387 +385 @@
 
             // see Functor::getFullIdentifier()
-            const std::type_index getFullIdentifier() const
+            const std::type_info& getFullIdentifier() const
                 { return typeid(F); }
 
@@ -549 +547 @@
 
             // see Functor::getHeaderIdentifier()
-            virtual const std::type_index getHeaderIdentifier() const override
+            virtual const std::type_info& getHeaderIdentifier() const override
             {
                 return typeid(typename detail::FunctionPointer<R, void, false, Params...>::Type);
@@ -555 +553 @@
 
             // see Functor::getHeaderIdentifier(unsigned int)
-            virtual const std::type_index getHeaderIdentifier(unsigned int params) const override
+            virtual const std::type_info& getHeaderIdentifier(unsigned int params) const override
             {
                 switch (params)
@@ -578 +576 @@
             ///Helper function that deduces a parameter pack of types and returns the corresponding identifier
             template<class... Types>
-            const std::type_index getTypelistIdentifier(detail::type_list<Types...>) const
+            const std::type_info& getTypelistIdentifier(detail::type_list<Types...>) const
             {
                 return typeid(typename detail::FunctionPointer<R, void, false, Types...>::Type);