Merge branch 'is_callable_check' into develop

boostorg · Jun 15, 2016 · 7f87b03 · 7f87b03
2 parents 6ac554e + 674e62b
commit 7f87b03
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/include/fit/is_callable.hpp b/include/fit/is_callable.hpp
@@ -54,7 +54,18 @@
 namespace fit {
 
 template<class F, class... Ts>
-FIT_USING(is_callable, detail::can_be_called<detail::apply_f, F, Ts...>);
+struct is_callable 
+: detail::can_be_called<detail::apply_f, F, Ts...>
+{};
+
+template<class F, class... Ts, class... Us>
+struct is_callable<F(Ts...), Us...>
+{
+    static_assert(!std::is_same<F, F>::value, 
+        "The is_callable<F(Args...)> form is not supported because it is problematic."
+        "Please use is_callable<F, Args...> instead."
+    );
+};
 
 } // namespace fit