forked from microsoft/GSL
Merge remote-tracking branch 'origin' into dev/neilmac/indextype
This commit is contained in:
@@ -508,7 +508,7 @@ namespace details
|
||||
template <size_t Rank, bool Enabled = (Rank > 1), typename Ret = std::enable_if_t<Enabled, index<Rank - 1>>>
|
||||
constexpr Ret shift_left(const index<Rank>& other) noexcept
|
||||
{
|
||||
Ret ret;
|
||||
Ret ret{};
|
||||
for (size_t i = 0; i < Rank - 1; ++i)
|
||||
{
|
||||
ret[i] = other[i + 1];
|
||||
@@ -865,7 +865,7 @@ public:
|
||||
constexpr bounds_iterator& operator+=(difference_type n) noexcept
|
||||
{
|
||||
auto linear_idx = linearize(curr) + n;
|
||||
std::remove_const_t<value_type> stride;
|
||||
std::remove_const_t<value_type> stride = 0;
|
||||
stride[rank - 1] = 1;
|
||||
for (size_t i = rank - 1; i-- > 0;)
|
||||
{
|
||||
|
||||
@@ -82,9 +82,9 @@ template<class T, class SizeType, const T Sentinel>
|
||||
array_view<T, dynamic_range> ensure_sentinel(const T* seq, SizeType max = std::numeric_limits<SizeType>::max())
|
||||
{
|
||||
auto cur = seq;
|
||||
while ((cur - seq) < max && *cur != Sentinel) ++cur;
|
||||
while (SizeType(cur - seq) < max && *cur != Sentinel) ++cur;
|
||||
fail_fast_assert(*cur == Sentinel);
|
||||
return{ seq, cur - seq };
|
||||
return{ seq, SizeType(cur - seq) };
|
||||
}
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ array_view<T, dynamic_range> ensure_sentinel(const T* seq, SizeType max = std::n
|
||||
template<class T>
|
||||
inline basic_string_view<T, dynamic_range> ensure_z(T* const & sz, std::ptrdiff_t max = PTRDIFF_MAX)
|
||||
{
|
||||
return ensure_sentinel<0>(sz, max);
|
||||
return ensure_sentinel<T, size_t, 0>(sz, max);
|
||||
}
|
||||
|
||||
// TODO (neilmac) there is probably a better template-magic way to get the const and non-const overloads to share an implementation
|
||||
|
||||
Reference in New Issue
Block a user