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

addressing Stephan's comments

Browse Source
This commit is contained in:
Jordan Maples 2020-05-20 16:50:50 -07:00
parent 313a1121bf
commit 7e4ed8da98
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/gsl/span
View File

@ -343,9 +343,9 @@ namespace details
constexpr extent_type() noexcept = default; constexpr extent_type() noexcept = default;
explicit constexpr extent_type(extent_type<dynamic_extent>); constexpr explicit extent_type(extent_type<dynamic_extent>);
explicit constexpr extent_type(size_type size) { Expects(size == Ext); } constexpr explicit extent_type(size_type size) { Expects(size == Ext); }
constexpr size_type size() const noexcept { return Ext; } constexpr size_type size() const noexcept { return Ext; }
}; };
@ -357,10 +357,10 @@ namespace details
using size_type = std::size_t; using size_type = std::size_t;
template <size_type Other> template <size_type Other>
explicit constexpr extent_type(extent_type<Other> ext) : size_(ext.size()) constexpr explicit extent_type(extent_type<Other> ext) : size_(ext.size())
{} {}
explicit constexpr extent_type(size_type size) : size_(size) constexpr explicit extent_type(size_type size) : size_(size)
{ {
Expects(size != dynamic_extent); Expects(size != dynamic_extent);
} }
@ -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 SpanExtent = Extent, std::enable_if_t<SpanExtent != gsl::dynamic_extent, int> = 0> template <std::size_t MyExtent = Extent, std::enable_if_t<MyExtent != 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 SpanExtent = Extent, std::enable_if_t<SpanExtent == gsl::dynamic_extent, int> = 0> template <std::size_t MyExtent = Extent, std::enable_if_t<MyExtent == 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 SpanExtent = Extent, std::enable_if_t<SpanExtent != gsl::dynamic_extent, int> = 0> template <std::size_t MyExtent = Extent, std::enable_if_t<MyExtent != 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 SpanExtent = Extent, std::enable_if_t<SpanExtent == gsl::dynamic_extent, int> = 0> template <std::size_t MyExtent = Extent, std::enable_if_t<MyExtent == 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))
{} {}
@ -517,18 +517,18 @@ 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 SpanExtent = Extent, class OtherElementType, std::size_t OtherExtent, std::size_t MyExtent = Extent,
std::enable_if_t< std::enable_if_t<
(SpanExtent == dynamic_extent || SpanExtent == OtherExtent) && (MyExtent == dynamic_extent || MyExtent == 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
: storage_(other.data(), details::extent_type<OtherExtent>(other.size())) : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
{} {}
template < template <
class OtherElementType, std::size_t OtherExtent, std::size_t SpanExtent = Extent, class OtherElementType, std::size_t OtherExtent, std::size_t MyExtent = Extent,
std::enable_if_t< std::enable_if_t<
SpanExtent != dynamic_extent && OtherExtent == dynamic_extent && MyExtent != dynamic_extent && OtherExtent == dynamic_extent &&
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
: storage_(other.data(), details::extent_type<OtherExtent>(other.size())) : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
@ -564,7 +564,7 @@ public:
{ {
Expects((size() >= Offset) && (Count == dynamic_extent || (Count <= size() - Offset))); Expects((size() >= Offset) && (Count == dynamic_extent || (Count <= size() - Offset)));
using type = typename details::calculate_subspan_type<ElementType, Extent, Offset, Count>::type; using type = typename details::calculate_subspan_type<ElementType, Extent, Offset, Count>::type;
return type(data() + Offset, Count == dynamic_extent ? size() - Offset : Count); return type{data() + Offset, Count == dynamic_extent ? size() - Offset : Count};
} }
constexpr span<element_type, dynamic_extent> first(size_type count) const noexcept constexpr span<element_type, dynamic_extent> first(size_type count) const noexcept
@ -775,8 +775,8 @@ as_bytes(span<ElementType, Extent> s) noexcept
// clang-format off // clang-format off
GSL_SUPPRESS(type.1) // NO-FORMAT: attribute GSL_SUPPRESS(type.1) // NO-FORMAT: attribute
// clang-format on // clang-format on
return span<const byte, details::calculate_byte_size<ElementType, Extent>::value>( using type = span<const byte, details::calculate_byte_size<ElementType, Extent>::value>;
reinterpret_cast<const byte*>(s.data()), s.size_bytes()); return type{reinterpret_cast<const byte*>(s.data()), s.size_bytes()};
} }
template <class ElementType, std::size_t Extent, template <class ElementType, std::size_t Extent,
@ -787,8 +787,8 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept
// clang-format off // clang-format off
GSL_SUPPRESS(type.1) // NO-FORMAT: attribute GSL_SUPPRESS(type.1) // NO-FORMAT: attribute
// clang-format on // clang-format on
return span<byte, details::calculate_byte_size<ElementType, Extent>::value>( using type = span<byte, details::calculate_byte_size<ElementType, Extent>::value>;
reinterpret_cast<byte*>(s.data()), s.size_bytes()); return type{reinterpret_cast<byte*>(s.data()), s.size_bytes()};
} }
} // namespace gsl } // namespace gsl