feedc0de/GSL
1
0
Fork 0
forked from microsoft/GSL
Code Pull Requests Activity

Replaced index constructor from initializer list by a constructor from static list

Browse Source 
Conflicts:
	include/array_view.h
This commit is contained in:
Anna Gringauze
2015-10-19 12:35:38 -07:00
parent 96e2f4b47f
commit 5f26ddac70
2 changed files with 96 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/array_view.h
+4 -7
View File
@@ -72,7 +72,7 @@ namespace details
template <typename SizeType>
struct SizeTypeTraits
{
static const SizeType max_value = std::is_signed<SizeType>::value ? static_cast<typename std::make_unsigned<SizeType>::type>(-1) / 2 : static_cast<SizeType>(-1);
static const SizeType max_value = std::numeric_limits<SizeType>::max();
};
}
@@ -99,12 +99,9 @@ public:
std::copy(values, values + Rank, elems);
}
// Preconditions: il.size() == rank
constexpr index(std::initializer_list<value_type> il) noexcept
{
fail_fast_assert(il.size() == Rank, "The size of the initializer list must match the rank of the array");
std::copy(begin(il), end(il), elems);
}
template<typename... Ts, bool Enabled = (sizeof...(Ts) == Rank), typename Dummy = std::enable_if_t<Enabled, bool>>
constexpr index(Ts... ds) noexcept : elems{ static_cast<value_type>(ds)... }
{}
constexpr index(const index& other) noexcept = default;