microsoft/GSL
1
0
Fork 1
mirror of https://github.com/microsoft/GSL.git synced 2026-02-01 10:59:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into dev/neilmac/indextype

Browse Source
This commit is contained in:
Neil MacIntosh
2015-11-02 19:01:59 -08:00
parent a4fa2b3bd9 ba3126105b
commit 16d1e77568
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/string_view.h
View File

@@ -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