Merge pull request #32 from jonathanpoelen/development

fixed drop with N = 9, 10, 11, 12, 13, 14 or 15
kvasir-io · Sep 21, 2017 · a4fef18 · a4fef18
2 parents b6c48ab + 8d9aa96
commit a4fef18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/kvasir/mpl/sequence/drop.hpp b/src/kvasir/mpl/sequence/drop.hpp
@@ -76,8 +76,7 @@ namespace kvasir {
 			struct drop_impl<8, C> {
 				template <unsigned N, typename T0, typename T1, typename T2, typename T3,
 				          typename T4, typename T5, typename T6, typename T7, typename... Ts>
-				using f = typename conditional<(sizeof...(Ts) <
-				                                1000000)>::template f<C, void>::template f<Ts...>;
+				using f = typename drop_impl<N-8, C>::template f<(N-8), Ts...>;
 			};
 			template <typename C>
 			struct drop_impl<16, C> {

diff --git a/test/sequence/at.hpp b/test/sequence/at.hpp
@@ -14,4 +14,9 @@ namespace {
 	namespace mpl = kvasir::mpl;
 
 	static_assert(std::is_same<mpl::eager::at<mpl::list<void, char, short>, 1>, char>::value, "");
+	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 7>, void>::value, "");
+	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 8>, char>::value, "");
+	static_assert(std::is_same<mpl::eager::at<mpl::list<int, int, int, int, int, int, int, void, char, short>, 9>, short>::value, "");
+	static_assert(std::is_same<mpl::eager::at<mpl::list<
+		int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int,	void, char, short>, 17>, char>::value, "");
 }