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

Removed redundant static_cast<> and is_same<> test.

Browse Source
This commit is contained in:
Neil MacIntosh 2016-09-14 22:01:02 -07:00
parent 8361aae39e
commit 831be5de39
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gsl/span
View File

@ -132,8 +132,7 @@ namespace details
template <class From, class To> template <class From, class To>
struct is_allowed_element_type_conversion struct is_allowed_element_type_conversion
: public std::integral_constant<bool, std::is_same<From, std::remove_cv_t<To>>::value || : public std::integral_constant<bool, std::is_convertible<From (*)[], To (*)[]>::value>
std::is_convertible<From(*)[], To(*)[]>::value>
{ {
}; };
@ -420,8 +419,7 @@ public:
details::is_allowed_extent_conversion<OtherExtent, Extent>::value && details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
constexpr span(const span<OtherElementType, OtherExtent>& other) constexpr span(const span<OtherElementType, OtherExtent>& other)
: storage_(static_cast<pointer>(other.data()), : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
details::extent_type<OtherExtent>(other.size()))
{ {
} }
@ -431,8 +429,7 @@ public:
details::is_allowed_extent_conversion<OtherExtent, Extent>::value && details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>> details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
constexpr span(span<OtherElementType, OtherExtent>&& other) constexpr span(span<OtherElementType, OtherExtent>&& other)
: storage_(static_cast<pointer>(other.data()), : storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
details::extent_type<OtherExtent>(other.size()))
{ {
} }
@ -626,7 +623,7 @@ as_writeable_bytes(span<ElementType, Extent> s) noexcept
// Specialization of gsl::at for span // Specialization of gsl::at for span
template <class ElementType, std::ptrdiff_t Extent> template <class ElementType, std::ptrdiff_t Extent>
constexpr ElementType& at(const span<ElementType ,Extent>& s, size_t index) constexpr ElementType& at(const span<ElementType, Extent>& s, size_t index)
{ {
// No bounds checking here because it is done in span::operator[] called below // No bounds checking here because it is done in span::operator[] called below
return s[index]; return s[index];