From e9ab01b894e64058aaa5c3bd9d36a7ebb1dcd9e1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 7 Jun 2015 00:03:06 +0100
Subject: [PATCH] function cleanup

---
 octa/functional.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/octa/functional.h b/octa/functional.h
index eedc0eb..74960bc 100644
--- a/octa/functional.h
+++ b/octa/functional.h
@@ -505,9 +505,6 @@ namespace detail {
         static constexpr bool value = false;
     };
 
-    struct Empty {
-    };
-
     template<typename T>
     T func_to_functor(T &&f) {
         return octa::forward<T>(f);
@@ -527,11 +524,13 @@ namespace detail {
 
     template<typename T, typename R, typename ...A>
     struct IsValidFunctor<T, R(A...)> {
+        struct Nat {};
+
         template<typename U>
         static decltype(func_to_functor(octa::declval<U>())
             (octa::declval<A>()...)) test(U *);
         template<typename>
-        static Empty test(...);
+        static Nat test(...);
 
         static constexpr bool value = octa::IsConvertible<
             decltype(test<T>(nullptr)), R
@@ -555,9 +554,8 @@ struct Function<R(A...)>: octa::detail::FunctionBase<R, A...> {
 
     template<typename T>
     Function(T f, EnableIf<
-        octa::detail::IsValidFunctor<T, R(A...)>::value,
-        octa::detail::Empty
-    > = octa::detail::Empty()) {
+        octa::detail::IsValidFunctor<T, R(A...)>::value, bool
+    > = true) {
         if (func_is_null(f)) {
             init_empty();
             return;