premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

more robust implementation of aux::array::end_index

This commit is contained in:
Alden Torres 2017-02-05 17:42:19 -05:00 committed by Arvid Norberg
parent 381defab05
commit bfe6aba728
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libtorrent/aux_/array.hpp
View File

@ -46,6 +46,9 @@ namespace libtorrent { namespace aux {
using base = std::array<T, Size>; using base = std::array<T, Size>;
using underlying_index = typename underlying_index_t<IndexType>::type; using underlying_index = typename underlying_index_t<IndexType>::type;
static_assert(Size <= std::size_t(std::numeric_limits<underlying_index>::max())
, "size is to big for index type");
array() = default; array() = default;
explicit array(std::array<T, Size>&& arr) : base(arr) {} explicit array(std::array<T, Size>&& arr) : base(arr) {}
@ -63,10 +66,9 @@ namespace libtorrent { namespace aux {
return this->base::operator[](std::size_t(static_cast<underlying_index>(idx))); return this->base::operator[](std::size_t(static_cast<underlying_index>(idx)));
} }
IndexType end_index() const constexpr IndexType end_index() const
{ {
TORRENT_ASSERT(this->size() <= std::size_t(std::numeric_limits<underlying_index>::max())); return IndexType(static_cast<underlying_index>(Size));
return IndexType(static_cast<underlying_index>(this->size()));
} }
}; };