para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming extent to prevent shadowing of static member

Browse Source
This commit is contained in:
Jordan Maples 2020-05-20 12:29:56 -07:00
parent 552cd20472
commit d3468230b1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/gsl/span
View File

@ -420,24 +420,24 @@ public:
constexpr span() noexcept : storage_(nullptr, details::extent_type<0>()) constexpr span() noexcept : storage_(nullptr, details::extent_type<0>())
{} {}
template<std::size_t extent = Extent, std::enable_if_t<extent != gsl::dynamic_extent, int> = 0> template<std::size_t SpanExtent = Extent, std::enable_if_t<SpanExtent != gsl::dynamic_extent, int> = 0>
constexpr explicit span(pointer ptr, size_type count) noexcept : storage_(ptr, count) constexpr explicit span(pointer ptr, size_type count) noexcept : storage_(ptr, count)
{ {
Expects(count == Extent); Expects(count == Extent);
} }
template<std::size_t extent = Extent, std::enable_if_t<extent == gsl::dynamic_extent, int> = 0> template<std::size_t SpanExtent = Extent, std::enable_if_t<SpanExtent == gsl::dynamic_extent, int> = 0>
constexpr span(pointer ptr, size_type count) noexcept : storage_(ptr, count) constexpr span(pointer ptr, size_type count) noexcept : storage_(ptr, count)
{} {}
template<std::size_t extent = Extent, std::enable_if_t<extent != gsl::dynamic_extent, int> = 0> template<std::size_t SpanExtent = Extent, std::enable_if_t<SpanExtent != gsl::dynamic_extent, int> = 0>
constexpr explicit span(pointer firstElem, pointer lastElem) noexcept constexpr explicit span(pointer firstElem, pointer lastElem) noexcept
: storage_(firstElem, static_cast<std::size_t>(lastElem - firstElem)) : storage_(firstElem, static_cast<std::size_t>(lastElem - firstElem))
{ {
Expects(lastElem - firstElem == static_cast<difference_type>(Extent)); Expects(lastElem - firstElem == static_cast<difference_type>(Extent));
} }
template<std::size_t extent = Extent, std::enable_if_t<extent == gsl::dynamic_extent, int> = 0> template<std::size_t SpanExtent = Extent, std::enable_if_t<SpanExtent == gsl::dynamic_extent, int> = 0>
constexpr span(pointer firstElem, pointer lastElem) noexcept constexpr span(pointer firstElem, pointer lastElem) noexcept
: storage_(firstElem, static_cast<std::size_t>(lastElem - firstElem)) : storage_(firstElem, static_cast<std::size_t>(lastElem - firstElem))
{} {}
@ -492,9 +492,9 @@ public:
constexpr span(const span& other) noexcept = default; constexpr span(const span& other) noexcept = default;
template < template <
class OtherElementType, std::size_t OtherExtent, std::size_t MyExtent = Extent, class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent,
std::enable_if_t< std::enable_if_t<
!(MyExtent != dynamic_extent && OtherExtent == dynamic_extent) && !(SpanExtent != dynamic_extent && OtherExtent == dynamic_extent) &&
(Extent == dynamic_extent || OtherExtent == dynamic_extent || Extent == OtherExtent) && (Extent == dynamic_extent || OtherExtent == dynamic_extent || Extent == OtherExtent) &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0>
constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept constexpr span(const span<OtherElementType, OtherExtent>& other) noexcept
@ -502,9 +502,9 @@ public:
{} {}
template < template <
class OtherElementType, std::size_t OtherExtent, std::size_t MyExtent = Extent, class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent,
std::enable_if_t< std::enable_if_t<
(MyExtent != dynamic_extent && OtherExtent == dynamic_extent) && (SpanExtent != dynamic_extent && OtherExtent == dynamic_extent) &&
(Extent == dynamic_extent || OtherExtent == dynamic_extent || Extent == OtherExtent) && (Extent == dynamic_extent || OtherExtent == dynamic_extent || Extent == OtherExtent) &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value, int> = 0>
constexpr explicit span(const span<OtherElementType, OtherExtent>& other) noexcept constexpr explicit span(const span<OtherElementType, OtherExtent>& other) noexcept