Add member function test for struct concept

boostorg · Jun 14, 2019 · 3cc1a71 · 3cc1a71
1 parent daa802d
commit 3cc1a71
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/include/boost/hana/detail/struct_macros.hpp b/include/boost/hana/detail/struct_macros.hpp
@@ -42,7 +42,7 @@ BOOST_HANA_NAMESPACE_BEGIN namespace struct_detail {
 
         template <typename Memptr2, typename T, std::enable_if_t<std::is_member_function_pointer_v<Memptr2>, int> = 0>
         constexpr decltype(auto) dispatch(T && t) const
-        { return [&](auto ... args) { return static_cast<T&&>(t).*ptr(args); }; }
+        { return [&](auto ... args) { return static_cast<T&&>(t).*ptr(args...); }; }
 
         template <typename T>
         constexpr decltype(auto) operator()(T && t) const

diff --git a/include/boost/hana/detail/struct_macros.hpp.erb b/include/boost/hana/detail/struct_macros.hpp.erb
@@ -60,7 +60,7 @@ BOOST_HANA_NAMESPACE_BEGIN namespace struct_detail {
 
         template <typename Memptr2, typename T, std::enable_if_t<std::is_member_function_pointer_v<Memptr2>, int> = 0>
         constexpr decltype(auto) dispatch(T && t) const
-        { return [&](auto ... args) { return static_cast<T&&>(t).*ptr(args); }; }
+        { return [&](auto ... args) { return static_cast<T&&>(t).*ptr(args...); }; }
 
         template <typename T>
         constexpr decltype(auto) operator()(T && t) const

diff --git a/test/concept/struct/macro.adapt_struct.cpp b/test/concept/struct/macro.adapt_struct.cpp
@@ -30,19 +30,24 @@ namespace ns {
     struct MemberArray {
         int array[10];
     };
+    struct MemberFunction {
+        int memfun(int x) { return x + 1; }
+    };
 }
 
 BOOST_HANA_ADAPT_STRUCT(ns::Data0);
 BOOST_HANA_ADAPT_STRUCT(ns::Data1, member1);
 BOOST_HANA_ADAPT_STRUCT(ns::Data2, member1, member2);
 BOOST_HANA_ADAPT_STRUCT(ns::Data3, member1, member2, member3);
 BOOST_HANA_ADAPT_STRUCT(ns::MemberArray, array);
+BOOST_HANA_ADAPT_STRUCT(ns::MemberFunction, memfun);
 
 static_assert(hana::Struct<ns::Data0>::value, "");
 static_assert(hana::Struct<ns::Data1>::value, "");
 static_assert(hana::Struct<ns::Data2>::value, "");
 static_assert(hana::Struct<ns::Data3>::value, "");
 static_assert(hana::Struct<ns::MemberArray>::value, "");
+static_assert(hana::Struct<ns::MemberFunction>::value, "");
 
 int main() {
     BOOST_HANA_CONSTANT_CHECK(hana::contains(ns::Data1{}, BOOST_HANA_STRING("member1")));
@@ -55,4 +60,9 @@ int main() {
     BOOST_HANA_CONSTANT_CHECK(hana::contains(ns::Data3{}, BOOST_HANA_STRING("member3")));
 
     BOOST_HANA_CONSTANT_CHECK(hana::contains(ns::MemberArray{}, BOOST_HANA_STRING("array")));
+
+    BOOST_HANA_CONSTANT_CHECK(hana::contains(ns::MemberFunction{}, BOOST_HANA_STRING("memfun")));
+
+    constexpr auto accessors = hana::accessors<ns::MemberFunction>();
+    BOOST_HANA_RUNTIME_CHECK(hana::second(accessors[hana::size_c<0>])(ns::MemberFunction{})(1) == 2);
 }