King_DuckZ/vectorwrapper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use the last index, not just the last value in Vec.

Browse source
This commit is contained in:
King_DuckZ 2017-07-26 23:53:13 +01:00
parent 42f3133640
commit 2ff4301471
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/vectorwrapper/sequence_range.hpp
View file

@ -111,6 +111,18 @@ namespace vwr {
}; };
namespace implem { namespace implem {
template <size_type SEEK, size_type IDX, size_type... I>
struct get_at_index;
template <size_type SEEK, size_type IDX, size_type I>
struct get_at_index<SEEK, IDX, I> {
static_assert(SEEK == IDX, "Index out of range");
static constexpr size_type value = I;
};
template <size_type SEEK, size_type IDX, size_type L, size_type... I>
struct get_at_index<SEEK, IDX, L, I...> {
static constexpr size_type value = (IDX == SEEK ? L : get_at_index<SEEK, IDX + 1, I...>::value);
};
template <typename T, typename OP, typename CMP, typename U> template <typename T, typename OP, typename CMP, typename U>
struct make_sequence_helper; struct make_sequence_helper;
@ -119,10 +131,11 @@ namespace vwr {
typedef sequence_range<Vec<T>, OP, CMP, I...> type; typedef sequence_range<Vec<T>, OP, CMP, I...> type;
}; };
template <typename V> template <typename V, size_type... I>
inline V make_end_vector (V parFrom, const V& parUpper) { inline V make_end_vector (V parFrom, const V& parUpper) {
auto& last = parFrom[V::dimensions - 1]; constexpr const size_type last_idx = get_at_index<sizeof...(I) - 1, 0, I...>::value;
const auto& upper_last = parUpper[V::dimensions - 1]; auto& last = parFrom[last_idx];
const auto& upper_last = parUpper[last_idx];
last = upper_last; last = upper_last;
return parFrom; return parFrom;
} }
@ -181,7 +194,7 @@ namespace vwr {
sequence_range<V, OP, CMP, I...>::sequence_range (const V& parFrom, const V& parUpper) : sequence_range<V, OP, CMP, I...>::sequence_range (const V& parFrom, const V& parUpper) :
m_from(parFrom), m_from(parFrom),
m_upper(parUpper), m_upper(parUpper),
m_end(implem::make_end_vector<V>(parFrom, parUpper)) m_end(implem::make_end_vector<V, I...>(parFrom, parUpper))
{ {
} }