mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Merge branch 'Microsoft/master'
This commit is contained in:
commit
ecc2ee5f1e
@ -125,7 +125,7 @@ public:
|
|||||||
template <typename OtherValueType,
|
template <typename OtherValueType,
|
||||||
bool Enabled = (details::SizeTypeTraits<OtherValueType>::max_value > details::SizeTypeTraits<value_type>::max_value),
|
bool Enabled = (details::SizeTypeTraits<OtherValueType>::max_value > details::SizeTypeTraits<value_type>::max_value),
|
||||||
typename Other = std::enable_if_t<Enabled, index<Rank, OtherValueType>>>
|
typename Other = std::enable_if_t<Enabled, index<Rank, OtherValueType>>>
|
||||||
constexpr index(const index<Rank, OtherValueType>& other, void* ptr = 0) noexcept
|
constexpr index(const index<Rank, OtherValueType>& other, void* = 0) noexcept
|
||||||
{
|
{
|
||||||
bool ok = std::accumulate(other.elems, other.elems + Rank, true,
|
bool ok = std::accumulate(other.elems, other.elems + Rank, true,
|
||||||
[&](bool b, OtherValueType val) { return b && (val <= static_cast<OtherValueType>(details::SizeTypeTraits<value_type>::max_value)); }
|
[&](bool b, OtherValueType val) { return b && (val <= static_cast<OtherValueType>(details::SizeTypeTraits<value_type>::max_value)); }
|
||||||
|
Loading…
Reference in New Issue
Block a user