From 8ad041cea02ebe722d29aa82e887e9aa7a2591c1 Mon Sep 17 00:00:00 2001
From: Peter Conrad <cyrano@quisquis.de>
Date: Mon, 3 Jun 2019 12:21:50 +0200
Subject: [PATCH] Replaced fc::deduce with
 std::remove_reference<std::remove_const<>>

---
 include/fc/thread/parallel.hpp | 2 +-
 include/fc/thread/task.hpp     | 5 +++--
 include/fc/thread/thread.hpp   | 2 +-
 include/fc/utility.hpp         | 6 ------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/fc/thread/parallel.hpp b/include/fc/thread/parallel.hpp
index a1eece5..6ad88c2 100644
--- a/include/fc/thread/parallel.hpp
+++ b/include/fc/thread/parallel.hpp
@@ -96,7 +96,7 @@ namespace fc {
    template<typename Functor>
    auto do_parallel( Functor&& f, const char* desc FC_TASK_NAME_DEFAULT_ARG ) -> fc::future<decltype(f())> {
       typedef decltype(f()) Result;
-      typedef typename fc::deduce<Functor>::type FunctorType;
+      typedef typename std::remove_const_t< std::remove_reference_t<Functor> > FunctorType;
       typename task<Result,sizeof(FunctorType)>::ptr tsk =
          task<Result,sizeof(FunctorType)>::create( std::forward<Functor>(f), desc );
       tsk->retain(); // HERE BE DRAFONS
diff --git a/include/fc/thread/task.hpp b/include/fc/thread/task.hpp
index db5bc66..3da124d 100644
--- a/include/fc/thread/task.hpp
+++ b/include/fc/thread/task.hpp
@@ -2,6 +2,7 @@
 #include <fc/thread/future.hpp>
 #include <fc/thread/priority.hpp>
 #include <fc/fwd.hpp>
+#include <type_traits>
 
 namespace fc {
   struct context;
@@ -127,7 +128,7 @@ namespace fc {
     private:
       template<typename Functor>
       task( Functor&& f, const char* desc ):promise_base(desc), task_base(&_functor), promise<R>(desc) {
-        typedef typename fc::deduce<Functor>::type FunctorType;
+        typedef typename std::remove_const_t< std::remove_reference_t<Functor> > FunctorType;
         static_assert( sizeof(f) <= sizeof(_functor), "sizeof(Functor) is larger than FunctorSize" );
         new ((char*)&_functor) FunctorType( std::forward<Functor>(f) );
         _destroy_functor = &detail::functor_destructor<FunctorType>::destroy;
@@ -155,7 +156,7 @@ namespace fc {
     private:
       template<typename Functor>
       task( Functor&& f, const char* desc ):promise_base(desc), task_base(&_functor), promise<void>(desc) {
-        typedef typename fc::deduce<Functor>::type FunctorType;
+        typedef typename std::remove_const_t< std::remove_reference_t<Functor> > FunctorType;
         static_assert( sizeof(f) <= sizeof(_functor), "sizeof(Functor) is larger than FunctorSize"  );
         new ((char*)&_functor) FunctorType( std::forward<Functor>(f) );
         _destroy_functor = &detail::functor_destructor<FunctorType>::destroy;
diff --git a/include/fc/thread/thread.hpp b/include/fc/thread/thread.hpp
index eb54959..2e275e6 100644
--- a/include/fc/thread/thread.hpp
+++ b/include/fc/thread/thread.hpp
@@ -86,7 +86,7 @@ namespace fc {
       template<typename Functor>
       auto async( Functor&& f, const char* desc FC_TASK_NAME_DEFAULT_ARG, priority prio = priority()) -> fc::future<decltype(f())> {
          typedef decltype(f()) Result;
-         typedef typename fc::deduce<Functor>::type FunctorType;
+         typedef typename std::remove_const_t< std::remove_reference_t<Functor> > FunctorType;
          typename task<Result,sizeof(FunctorType)>::ptr tsk = 
               task<Result,sizeof(FunctorType)>::create( std::forward<Functor>(f), desc );
          tsk->retain(); // HERE BE DRAFONS
diff --git a/include/fc/utility.hpp b/include/fc/utility.hpp
index c08160c..7c7983c 100644
--- a/include/fc/utility.hpp
+++ b/include/fc/utility.hpp
@@ -19,12 +19,6 @@ namespace fc {
   using std::size_t;
   typedef decltype(nullptr) nullptr_t;
 
-  template<typename T> struct deduce           { typedef T type; };
-  template<typename T> struct deduce<T&>       { typedef T type; };
-  template<typename T> struct deduce<const T&> { typedef T type; };
-  template<typename T> struct deduce<T&&>      { typedef T type; };
-  template<typename T> struct deduce<const T&&>{ typedef T type; };
-
   struct true_type  { enum _value { value = 1 }; };
   struct false_type { enum _value { value = 0 }; };