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

Missed some usings. Also, no longer removing CV qualifiers.

Browse Source
This commit is contained in:
Kern Handa 2015-09-25 00:29:17 -07:00
parent 33e61f0115
commit b9b9ae5f3d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/array_view.h
View File

@ -81,9 +81,9 @@ namespace details
template <typename OtherConcreteType, typename OtherValueType, unsigned int OtherRank> template <typename OtherConcreteType, typename OtherValueType, unsigned int OtherRank>
friend class coordinate_facade; friend class coordinate_facade;
public: public:
using reference = typename std::add_lvalue_reference<ValueType>::type; using value_type = typename std::remove_reference<ValueType>::type;
using const_reference = typename std::add_lvalue_reference<typename std::add_const<ValueType>::type>::type; using reference = typename std::add_lvalue_reference<value_type>::type;
using value_type = typename std::remove_reference<typename std::remove_cv<ValueType>::type>::type; using const_reference = typename std::add_lvalue_reference<typename std::add_const<value_type>::type>::type;
static const unsigned int rank = Rank; static const unsigned int rank = Rank;
_CONSTEXPR coordinate_facade() _NOEXCEPT _CONSTEXPR coordinate_facade() _NOEXCEPT
{ {
@ -1363,9 +1363,9 @@ public:
using bounds_type = BoundsType; using bounds_type = BoundsType;
using size_type = typename bounds_type::size_type; using size_type = typename bounds_type::size_type;
using index_type = typename bounds_type::index_type; using index_type = typename bounds_type::index_type;
using value_type = ValueType; using value_type = typename std::remove_reference<ValueType>::type;
using pointer = ValueType*; using pointer = typename std::add_pointer<value_type>::type;
using reference = ValueType&; using reference = typename std::add_lvalue_reference<value_type>::type;
using iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view>, general_array_view_iterator<basic_array_view>>; using iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view>, general_array_view_iterator<basic_array_view>>;
using const_iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view<const ValueType, BoundsType>>, general_array_view_iterator<basic_array_view<const ValueType, BoundsType>>>; using const_iterator = std::conditional_t<std::is_same<typename BoundsType::mapping_type, contiguous_mapping_tag>::value, contiguous_array_view_iterator<basic_array_view<const ValueType, BoundsType>>, general_array_view_iterator<basic_array_view<const ValueType, BoundsType>>>;
using reverse_iterator = std::reverse_iterator<iterator>; using reverse_iterator = std::reverse_iterator<iterator>;