microsoft/GSL
1
0
Fork 1
mirror of https://github.com/microsoft/GSL.git synced 2026-05-03 19:30:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

gsl::index ptrdiff_t -> size_t. remove span::at span::operator().

Browse Source
This commit is contained in:
Jordan Maples [MSFT]
2020-02-04 16:53:43 -08:00
parent 5a1e4f3953
commit d7e1611137
5 changed files with 39 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gsl/gsl_util
+6 -7
View File
@@ -49,7 +49,7 @@ namespace gsl
//
// index type for all container indexes/subscripts/sizes
using index = std::ptrdiff_t;
using index = std::size_t;
// final_action allows you to ensure something gets run at the end of a scope
template <class F>
@@ -129,8 +129,8 @@ GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
constexpr T& at(T (&arr)[N], const index i)
{
Expects(i >= 0 && i < narrow_cast<index>(N));
return arr[narrow_cast<std::size_t>(i)];
Expects(i >= 0 && i < N);
return arr[i];
}
template <class Cont>
@@ -138,16 +138,15 @@ GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
constexpr auto at(Cont& cont, const index i) -> decltype(cont[cont.size()])
{
Expects(i >= 0 && i < narrow_cast<index>(cont.size()));
using size_type = decltype(cont.size());
return cont[narrow_cast<size_type>(i)];
Expects(i >= 0 && i < cont.size());
return cont[i];
}
template <class T>
GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
constexpr T at(const std::initializer_list<T> cont, const index i)
{
Expects(i >= 0 && i < narrow_cast<index>(cont.size()));
Expects(i >= 0 && i < cont.size());
return *(cont.begin() + i);
}
include/gsl/span
+19 -29
View File
@@ -552,16 +552,6 @@ public:
return data()[size() - 1];
}
// at and operator() are deprecated to align to the public member functions of std::span
[[deprecated("Use operator[]")]] constexpr reference at(size_type idx) const noexcept
{
return this->operator[](idx);
}
[[deprecated("Use operator[]")]] constexpr reference operator()(size_type idx) const noexcept
{
return this->operator[](idx);
}
constexpr pointer data() const noexcept { return storage_.data(); }
// [span.iter], span iterator support
@@ -817,67 +807,67 @@ constexpr ElementType& at(span<ElementType, Extent> s, index i)
// [span.obs] Free observer functions
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::size_type
ssize(const span<ElementType, Extent>& span) noexcept
constexpr std::ptrdiff_t
ssize(const span<ElementType, Extent>& s) noexcept
{
return span.size();
return static_cast<std::ptrdiff_t>(s.size());
}
// [span.iter] Free functions for begin/end functions
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::iterator
begin(const span<ElementType, Extent>& span) noexcept
begin(const span<ElementType, Extent>& s) noexcept
{
return span.begin();
return s.begin();
}
template <class ElementType, std::size_t Extent = dynamic_extent>
constexpr typename span<ElementType, Extent>::iterator
end(const span<ElementType, Extent>& span) noexcept
end(const span<ElementType, Extent>& s) noexcept
{
return span.end();
return s.end();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::const_iterator
cbegin(const span<ElementType, Extent>& span) noexcept
cbegin(const span<ElementType, Extent>& s) noexcept
{
return span.cbegin();
return s.cbegin();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::const_iterator
cend(const span<ElementType, Extent>& span) noexcept
cend(const span<ElementType, Extent>& s) noexcept
{
return span.cend();
return s.cend();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::reverse_iterator
rbegin(const span<ElementType, Extent>& span) noexcept
rbegin(const span<ElementType, Extent>& s) noexcept
{
return span.rbegin();
return s.rbegin();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::reverse_iterator
rend(const span<ElementType, Extent>& span) noexcept
rend(const span<ElementType, Extent>& s) noexcept
{
return span.rend();
return s.rend();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::const_reverse_iterator
crbegin(const span<ElementType, Extent>& span) noexcept
crbegin(const span<ElementType, Extent>& s) noexcept
{
return span.crbegin();
return s.crbegin();
}
template <class ElementType, std::size_t Extent>
constexpr typename span<ElementType, Extent>::const_reverse_iterator
crend(const span<ElementType, Extent>& span) noexcept
crend(const span<ElementType, Extent>& s) noexcept
{
return span.crend();
return s.crend();
}
} // namespace gsl