fixes at_c with C-style array

edouarda · Apr 3, 2016 · 7d4107a · 7d4107a
1 parent f719035
commit 7d4107a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/brigand/sequences/at.hpp b/brigand/sequences/at.hpp
@@ -19,15 +19,15 @@ namespace brigand
     template<class... Ts>
     struct element_at<list<Ts...>>
     {
-      template<class T> T static at(Ts..., T*, ...);
+      template<class T> type_<T> static at(Ts..., T*, ...);
     };
 
     template<std::size_t N, typename Seq> struct at_impl;
 
     template<std::size_t N, template<typename...> class L, class... Ts>
     struct at_impl<N,L<Ts...>>
+    : decltype(element_at<brigand::filled_list<void const *, N>>::at(static_cast<Ts*>(nullptr)...))
     {
-      using type = decltype(element_at<brigand::filled_list<void const *, N>>::at(static_cast<Ts*>(nullptr)...));
     };
   }
 

diff --git a/test/list_test.cpp b/test/list_test.cpp
@@ -117,6 +117,8 @@ static_assert(std::is_same<brigand::at_c<int_bool_bool_int_list, 2>, bool>::valu
               "invalid at result");
 static_assert(std::is_same<brigand::at_c<int_bool_bool_int_list, 3>, int>::value,
               "invalid at result");
+static_assert(std::is_same<brigand::at_c<brigand::list<int[1]>, 0>, int[1]>::value,
+              "invalid at result");
 
 static_assert(
     std::is_same<brigand::at<int_bool_bool_int_list, std::integral_constant<int, 0>>, int>::value,
@@ -198,6 +200,8 @@ static_assert(std::is_same<brigand::at_c<int_bool_bool_int_list, 2>, bool>::valu
               "invalid at result");
 static_assert(std::is_same<brigand::at_c<int_bool_bool_int_list, 3>, int>::value,
               "invalid at result");
+static_assert(std::is_same<brigand::at_c<custom_list<int[1]>, 0>, int[1]>::value,
+              "invalid at result");
 
 static_assert(
     std::is_same<brigand::at<int_bool_bool_int_list, std::integral_constant<int, 0>>, int>::value,