microsoft/GSL
1
0
Fork 1
mirror of https://github.com/microsoft/GSL.git synced 2025-11-17 15:59:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added missing owner<T>, corrected array_view::sub().

Browse Source
This commit is contained in:
Neil MacIntosh
2015-09-20 19:18:12 -07:00
parent 652d886963
commit 05e6b6dd4b
5 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/array_view.h
View File

@@ -1824,15 +1824,15 @@ public:
template<size_t Offset, size_t Count>
_CONSTEXPR array_view<ValueTypeOpt, Count> sub() const _NOEXCEPT
{
static_assert(bounds_type::static_size == dynamic_range || ((Offset == 0 || Offset < bounds_type::static_size) && Offset + Count <= bounds_type::static_size), "Index is out of bound");
fail_fast_assert(bounds_type::static_size != dynamic_range || ((Offset == 0 || Offset < this->size()) && Offset + Count <= this->size()));
static_assert(bounds_type::static_size == dynamic_range || ((Offset == 0 || Offset <= bounds_type::static_size) && Offset + Count <= bounds_type::static_size), "Index is out of bound");
fail_fast_assert(bounds_type::static_size != dynamic_range || ((Offset == 0 || Offset <= this->size()) && Offset + Count <= this->size()));
return { this->data() + Offset, Count };
}
_CONSTEXPR array_view<ValueTypeOpt, dynamic_range> sub(size_type offset, size_type count) const _NOEXCEPT
_CONSTEXPR array_view<ValueTypeOpt, dynamic_range> sub(size_type offset, size_type count = dynamic_range) const _NOEXCEPT
{
fail_fast_assert((offset == 0 || offset < this->size()) && offset + count <= this->size());
return { this->data() + offset, count };
fail_fast_assert((offset == 0 || offset <= this->size()) && (count == dynamic_range || (offset + count) <= this->size()));
return { this->data() + offset, count == dynamic_range ? this->length() - offset : count };
}
// size