wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach move_iterator that rvalue references cannot bind to non-function 

lvalues, nor can one take the address of an xvalue, by adding
appropriate static_cast's (in the first case) and a temporary (in the
second case).

llvm-svn: 124255
This commit is contained in:
Douglas Gregor 2011-01-26 00:12:48 +00:00
parent 3fde51b820
commit d18302f1bb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/include/iterator
View File

@ -902,8 +902,13 @@ public:
template <class _Up> _LIBCPP_INLINE_VISIBILITY move_iterator(const move_iterator<_Up>& __u) template <class _Up> _LIBCPP_INLINE_VISIBILITY move_iterator(const move_iterator<_Up>& __u)
: __i(__u.base()) {} : __i(__u.base()) {}
_LIBCPP_INLINE_VISIBILITY _Iter base() const {return __i;} _LIBCPP_INLINE_VISIBILITY _Iter base() const {return __i;}
_LIBCPP_INLINE_VISIBILITY reference operator*() const {return *__i;} _LIBCPP_INLINE_VISIBILITY reference operator*() const {
_LIBCPP_INLINE_VISIBILITY pointer operator->() const {return &(operator*());} return static_cast<reference>(*__i);
}
_LIBCPP_INLINE_VISIBILITY pointer operator->() const {
typename iterator_traits<iterator_type>::reference __ref = *__i;
return &__ref;
}
_LIBCPP_INLINE_VISIBILITY move_iterator& operator++() {++__i; return *this;} _LIBCPP_INLINE_VISIBILITY move_iterator& operator++() {++__i; return *this;}
_LIBCPP_INLINE_VISIBILITY move_iterator operator++(int) _LIBCPP_INLINE_VISIBILITY move_iterator operator++(int)
{move_iterator __tmp(*this); ++__i; return __tmp;} {move_iterator __tmp(*this); ++__i; return __tmp;}
@ -919,7 +924,9 @@ public:
_LIBCPP_INLINE_VISIBILITY move_iterator& operator-=(difference_type __n) _LIBCPP_INLINE_VISIBILITY move_iterator& operator-=(difference_type __n)
{__i -= __n; return *this;} {__i -= __n; return *this;}
_LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const _LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const
{return __i[__n];} {
return static_cast<reference>(__i[__n]);
}
}; };
template <class _Iter1, class _Iter2> template <class _Iter1, class _Iter2>