Changeset 10987 for code/branches/cpp11_v2

Timestamp:

Dec 28, 2015, 10:17:50 PM (9 years ago)

Author:

landauf

Message:

now it also works with MSVC to wrap an std::function in a Functor

File:

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

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

@@ -421 +421 @@
         { typedef T Type; };
 
-        //Helper structs to deduce the first N types of a parameter pack
+        // Helper structs to deduce the first N types of a parameter pack
         template<class... Types> struct type_list {};
 
@@ -564 +564 @@
 
     private:
-            ///Helper function that deduces a parameter pack of types and returns the corresponding identifier
+            /// Helper function that deduces a parameter pack of types and returns the corresponding identifier
             template<class... Types>
             const std::type_info& getTypelistIdentifier(detail::type_list<Types...>) const
@@ -575 +575 @@
     namespace detail
     {
-        //Helper functions to deduce types and constness of operator() and return the correct FunctorCallable
-        template <class F, class R, class... Params> inline FunctorStaticPtr callableHelper(const F& functionObject, R(F::*)(Params...))       { return std::make_shared<FunctorTemplate<F, R, void, false, Params...>>(functionObject); }
-        template <class F, class R, class... Params> inline FunctorStaticPtr callableHelper(const F& functionObject, R(F::*)(Params...) const) { return std::make_shared<FunctorTemplate<F, R, void, false, Params...>>(functionObject); } // note: both const and non-const function-objects are treated as static functors with isconst=false.
+        // Helper functions to deduce types and constness of operator() and return the correct FunctorTemplate
+        template <class F>
+        struct CallableHelper
+        {
+            template <class R, class... Params> static inline FunctorStaticPtr create(const F& functionObject, R(F::*)(Params...))       { return std::make_shared<FunctorTemplate<F, R, void, false, Params...>>(functionObject); }
+            template <class R, class... Params> static inline FunctorStaticPtr create(const F& functionObject, R(F::*)(Params...) const) { return std::make_shared<FunctorTemplate<F, R, void, false, Params...>>(functionObject); } // note: both const and non-const function-objects are treated as static functors with isconst=false.
+        };
     }
 
@@ -589 +593 @@
 
     /** Take care that this functor does not outlive objects that have been captured by reference in a lambda. */
-    template <class F> inline FunctorStaticPtr createFunctor(const F& functionObject) { return detail::callableHelper(functionObject, &F::operator()); } ///< Creates a new Functor with a callable object
+    template <class F> inline FunctorStaticPtr createFunctor(const F& functionObject) { return detail::CallableHelper<F>::create(functionObject, &F::operator()); } ///< Creates a new Functor with a callable object
 }