diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-03-12 01:19:36 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-03-12 01:19:36 +0000 |
| commit | 5a8e27b5b325198cd04c5ea74db1c00de6244456 (patch) | |
| tree | 07b909937efc1eca170ccb30803b0300385987ff | |
| parent | 668a1d8c44e6659b0b0d4d48daa3c0f79b77f6d5 (diff) | |
| download | libcxx_35a-5a8e27b5b325198cd04c5ea74db1c00de6244456.tar.gz | |
THIRD TIME. Richard pointed out (again) that I'd switched the order of the instance variables; and thus failed to repair the ABI break. After this, I'm going to sit down and watch TV for the evening.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@203631 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/iterator | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/iterator b/include/iterator index 263ff3f5..f338e018 100644 --- a/include/iterator +++ b/include/iterator @@ -536,20 +536,20 @@ class _LIBCPP_TYPE_VIS_ONLY reverse_iterator typename iterator_traits<_Iter>::pointer, typename iterator_traits<_Iter>::reference> { -protected: - _Iter current; private: mutable _Iter __t; // no longer used as of LWG #2360, not removed due to ABI break +protected: + _Iter current; public: typedef _Iter iterator_type; typedef typename iterator_traits<_Iter>::difference_type difference_type; typedef typename iterator_traits<_Iter>::reference reference; typedef typename iterator_traits<_Iter>::pointer pointer; - _LIBCPP_INLINE_VISIBILITY reverse_iterator() : current(), __t() {} - _LIBCPP_INLINE_VISIBILITY explicit reverse_iterator(_Iter __x) : current(__x), __t() {} + _LIBCPP_INLINE_VISIBILITY reverse_iterator() : current() {} + _LIBCPP_INLINE_VISIBILITY explicit reverse_iterator(_Iter __x) : __t(__x), current(__x) {} template <class _Up> _LIBCPP_INLINE_VISIBILITY reverse_iterator(const reverse_iterator<_Up>& __u) - : current(__u.base()), __t() {} + : __t(__u.base()), current(__u.base()) {} _LIBCPP_INLINE_VISIBILITY _Iter base() const {return current;} _LIBCPP_INLINE_VISIBILITY reference operator*() const {_Iter __tmp = current; return *--__tmp;} _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return _VSTD::addressof(operator*());} |