JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

function cleanup

master
Daniel Kolesa 2015-06-07 00:03:06 +01:00
parent d6d0ff3e8d
commit e9ab01b894
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
octa/functional.h
View File

@ -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;