From 19a68c64d7a4e13fd1e6b2cd5b3851974732f12a Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:41:57 -0400 Subject: [PATCH] remove is_callable_v<> workaround --- .../meta_refl/include/bluegrass/meta/function_traits.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/meta_refl/include/bluegrass/meta/function_traits.hpp b/libraries/meta_refl/include/bluegrass/meta/function_traits.hpp index 3940c2d8f3..1614d4e522 100644 --- a/libraries/meta_refl/include/bluegrass/meta/function_traits.hpp +++ b/libraries/meta_refl/include/bluegrass/meta/function_traits.hpp @@ -81,9 +81,6 @@ namespace bluegrass { namespace meta { inline constexpr U&& make_dependent(U&& u) { return static_cast(u); } } - template - inline constexpr static bool is_callable_v = BLUEGRASS_HAS_MEMBER(AUTO_PARAM_WORKAROUND(FN), operator()); - template constexpr bool is_callable(F&& fn) { return BLUEGRASS_HAS_MEMBER(fn, operator()); } @@ -111,7 +108,7 @@ namespace bluegrass { namespace meta { std::tuple, Args>...>>; template constexpr auto get_types(F&& fn) { - if constexpr (is_callable_v) + if constexpr (is_callable(fn)) return get_types(&F::operator()); else return get_types(fn); @@ -153,7 +150,7 @@ namespace bluegrass { namespace meta { constexpr auto parameters_from_impl(R(Cls::*)(Args...)const &&) -> pack_from_t; template constexpr auto parameters_from_impl(F&& fn) { - if constexpr (is_callable_v) + if constexpr (is_callable(fn)) return parameters_from_impl(&F::operator()); else return parameters_from_impl(fn);