|
@@ -23,19 +23,20 @@ _LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
template <class _Iter>
|
|
|
class _LIBCPP_TEMPLATE_VIS move_iterator
|
|
|
{
|
|
|
-private:
|
|
|
- _Iter __i;
|
|
|
public:
|
|
|
- typedef _Iter iterator_type;
|
|
|
+#if _LIBCPP_STD_VER > 17
|
|
|
+ typedef input_iterator_tag iterator_concept;
|
|
|
+#endif
|
|
|
+
|
|
|
+ typedef _Iter iterator_type;
|
|
|
+ typedef _If<
|
|
|
+ __is_cpp17_random_access_iterator<_Iter>::value,
|
|
|
+ random_access_iterator_tag,
|
|
|
+ typename iterator_traits<_Iter>::iterator_category
|
|
|
+ > iterator_category;
|
|
|
typedef typename iterator_traits<iterator_type>::value_type value_type;
|
|
|
typedef typename iterator_traits<iterator_type>::difference_type difference_type;
|
|
|
typedef iterator_type pointer;
|
|
|
- typedef _If<__is_cpp17_random_access_iterator<_Iter>::value,
|
|
|
- random_access_iterator_tag,
|
|
|
- typename iterator_traits<_Iter>::iterator_category> iterator_category;
|
|
|
-#if _LIBCPP_STD_VER > 17
|
|
|
- typedef input_iterator_tag iterator_concept;
|
|
|
-#endif
|
|
|
|
|
|
#ifndef _LIBCPP_CXX03_LANG
|
|
|
typedef typename iterator_traits<iterator_type>::reference __reference;
|
|
@@ -48,114 +49,113 @@ public:
|
|
|
typedef typename iterator_traits<iterator_type>::reference reference;
|
|
|
#endif
|
|
|
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator() : __i() {}
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator() : __current_() {}
|
|
|
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- explicit move_iterator(_Iter __x) : __i(__x) {}
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ explicit move_iterator(_Iter __i) : __current_(__i) {}
|
|
|
|
|
|
template <class _Up, class = __enable_if_t<
|
|
|
- !is_same<_Up, _Iter>::value && is_convertible<_Up const&, _Iter>::value
|
|
|
+ !is_same<_Up, _Iter>::value && is_convertible<const _Up&, _Iter>::value
|
|
|
> >
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator(const move_iterator<_Up>& __u) : __i(__u.base()) {}
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator(const move_iterator<_Up>& __u) : __current_(__u.base()) {}
|
|
|
|
|
|
template <class _Up, class = __enable_if_t<
|
|
|
!is_same<_Up, _Iter>::value &&
|
|
|
- is_convertible<_Up const&, _Iter>::value &&
|
|
|
- is_assignable<_Iter&, _Up const&>::value
|
|
|
+ is_convertible<const _Up&, _Iter>::value &&
|
|
|
+ is_assignable<_Iter&, const _Up&>::value
|
|
|
> >
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
move_iterator& operator=(const move_iterator<_Up>& __u) {
|
|
|
- __i = __u.base();
|
|
|
+ __current_ = __u.base();
|
|
|
return *this;
|
|
|
}
|
|
|
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 _Iter base() const {return __i;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- reference operator*() const { return static_cast<reference>(*__i); }
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- pointer operator->() const { return __i;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator& operator++() {++__i; return *this;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator operator++(int) {move_iterator __tmp(*this); ++__i; return __tmp;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator& operator--() {--__i; return *this;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator operator--(int) {move_iterator __tmp(*this); --__i; return __tmp;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator operator+ (difference_type __n) const {return move_iterator(__i + __n);}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator& operator+=(difference_type __n) {__i += __n; return *this;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator operator- (difference_type __n) const {return move_iterator(__i - __n);}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- move_iterator& operator-=(difference_type __n) {__i -= __n; return *this;}
|
|
|
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
- reference operator[](difference_type __n) const { return static_cast<reference>(__i[__n]); }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ _Iter base() const { return __current_; }
|
|
|
+
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ reference operator*() const { return static_cast<reference>(*__current_); }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ pointer operator->() const { return __current_; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ reference operator[](difference_type __n) const { return static_cast<reference>(__current_[__n]); }
|
|
|
+
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator& operator++() { ++__current_; return *this; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator operator++(int) { move_iterator __tmp(*this); ++__current_; return __tmp; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator& operator--() { --__current_; return *this; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator operator--(int) { move_iterator __tmp(*this); --__current_; return __tmp; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator operator+(difference_type __n) const { return move_iterator(__current_ + __n); }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator& operator+=(difference_type __n) { __current_ += __n; return *this; }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator operator-(difference_type __n) const { return move_iterator(__current_ - __n); }
|
|
|
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+ move_iterator& operator-=(difference_type __n) { __current_ -= __n; return *this; }
|
|
|
+
|
|
|
+private:
|
|
|
+ _Iter __current_;
|
|
|
};
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
return __x.base() == __y.base();
|
|
|
}
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator<(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
- return __x.base() < __y.base();
|
|
|
+ return __x.base() != __y.base();
|
|
|
}
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator<(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
- return __x.base() != __y.base();
|
|
|
+ return __x.base() < __y.base();
|
|
|
}
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
return __x.base() > __y.base();
|
|
|
}
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator>=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
- return __x.base() >= __y.base();
|
|
|
+ return __x.base() <= __y.base();
|
|
|
}
|
|
|
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-bool
|
|
|
-operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+bool operator>=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
|
- return __x.base() <= __y.base();
|
|
|
+ return __x.base() >= __y.base();
|
|
|
}
|
|
|
|
|
|
#ifndef _LIBCPP_CXX03_LANG
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
-auto
|
|
|
-operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
--> decltype(__x.base() - __y.base())
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+auto operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
+ -> decltype(__x.base() - __y.base())
|
|
|
{
|
|
|
return __x.base() - __y.base();
|
|
|
}
|
|
|
#else
|
|
|
template <class _Iter1, class _Iter2>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI
|
|
|
typename move_iterator<_Iter1>::difference_type
|
|
|
operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
{
|
|
@@ -164,7 +164,7 @@ operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
|
|
|
#endif
|
|
|
|
|
|
template <class _Iter>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
move_iterator<_Iter>
|
|
|
operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x)
|
|
|
{
|
|
@@ -172,7 +172,7 @@ operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterato
|
|
|
}
|
|
|
|
|
|
template <class _Iter>
|
|
|
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX14
|
|
|
move_iterator<_Iter>
|
|
|
make_move_iterator(_Iter __i)
|
|
|
{
|