From 6daf534441d72fa6d67ea229a1151636e439d964 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 2 Dec 2013 03:24:33 +0000 Subject: [PATCH] Fix for PRPR17934; based on a fix suggested by Peter Sommerlad git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@196058 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/iterator | 95 +++++++++---------- .../sequences/array/iterators.pass.cpp | 38 ++++++-- .../iterator.range/begin-end.pass.cpp | 1 + 3 files changed, 75 insertions(+), 59 deletions(-) diff --git a/include/iterator b/include/iterator index d16aa2aa..1c59919e 100644 --- a/include/iterator +++ b/include/iterator @@ -1387,6 +1387,22 @@ operator+(typename __wrap_iter<_Iter>::difference_type __n, #if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN) +template +inline _LIBCPP_INLINE_VISIBILITY +_Tp* +begin(_Tp (&__array)[_Np]) +{ + return __array; +} + +template +inline _LIBCPP_INLINE_VISIBILITY +_Tp* +end(_Tp (&__array)[_Np]) +{ + return __array + _Np; +} + template inline _LIBCPP_INLINE_VISIBILITY auto @@ -1421,18 +1437,46 @@ end(const _Cp& __c) -> decltype(__c.end()) #if _LIBCPP_STD_VER > 11 +template +inline _LIBCPP_INLINE_VISIBILITY +reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np]) +{ + return reverse_iterator<_Tp*>(__array + _Np); +} + +template +inline _LIBCPP_INLINE_VISIBILITY +reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np]) +{ + return reverse_iterator<_Tp*>(__array); +} + +template +inline _LIBCPP_INLINE_VISIBILITY +reverse_iterator rbegin(initializer_list<_Ep> __il) +{ + return reverse_iterator(__il.end()); +} + +template +inline _LIBCPP_INLINE_VISIBILITY +reverse_iterator rend(initializer_list<_Ep> __il) +{ + return reverse_iterator(__il.begin()); +} + template inline _LIBCPP_INLINE_VISIBILITY auto cbegin(const _Cp& __c) -> decltype(begin(__c)) { - return __c.begin(); + return _VSTD::begin(__c); } template inline _LIBCPP_INLINE_VISIBILITY auto cend(const _Cp& __c) -> decltype(end(__c)) { - return __c.end(); + return _VSTD::end(__c); } template @@ -1516,53 +1560,6 @@ end(const _Cp& __c) #endif // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN) -template -inline _LIBCPP_INLINE_VISIBILITY -_Tp* -begin(_Tp (&__array)[_Np]) -{ - return __array; -} - -template -inline _LIBCPP_INLINE_VISIBILITY -_Tp* -end(_Tp (&__array)[_Np]) -{ - return __array + _Np; -} - -#if _LIBCPP_STD_VER > 11 -template -inline _LIBCPP_INLINE_VISIBILITY -reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np]) -{ - return reverse_iterator<_Tp*>(__array + _Np); -} - -template -inline _LIBCPP_INLINE_VISIBILITY -reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np]) -{ - return reverse_iterator<_Tp*>(__array); -} - -template -inline _LIBCPP_INLINE_VISIBILITY -reverse_iterator rbegin(initializer_list<_Ep> __il) -{ - return reverse_iterator(__il.end()); -} - -template -inline _LIBCPP_INLINE_VISIBILITY -reverse_iterator rend(initializer_list<_Ep> __il) -{ - return reverse_iterator(__il.begin()); -} - -#endif - _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP_ITERATOR diff --git a/test/containers/sequences/array/iterators.pass.cpp b/test/containers/sequences/array/iterators.pass.cpp index 8da3803d..3014fd54 100644 --- a/test/containers/sequences/array/iterators.pass.cpp +++ b/test/containers/sequences/array/iterators.pass.cpp @@ -50,11 +50,20 @@ int main() assert ( !(ii1 != ii2 )); assert ( !(ii1 != cii )); -// C c; -// assert ( ii1 != c.cbegin()); -// assert ( cii != c.begin()); -// assert ( cii != c.cend()); -// assert ( ii1 != c.end()); + C c; + assert ( c.begin() == std::begin(c)); + assert ( c.cbegin() == std::cbegin(c)); + assert ( c.rbegin() == std::rbegin(c)); + assert ( c.crbegin() == std::crbegin(c)); + assert ( c.end() == std::end(c)); + assert ( c.cend() == std::cend(c)); + assert ( c.rend() == std::rend(c)); + assert ( c.crend() == std::crend(c)); + + assert ( std::begin(c) != std::end(c)); + assert ( std::rbegin(c) != std::rend(c)); + assert ( std::cbegin(c) != std::cend(c)); + assert ( std::crbegin(c) != std::crend(c)); } { typedef std::array C; @@ -68,11 +77,20 @@ int main() assert ( !(ii1 != ii2 )); assert ( !(ii1 != cii )); -// C c; -// assert ( ii1 != c.cbegin()); -// assert ( cii != c.begin()); -// assert ( cii != c.cend()); -// assert ( ii1 != c.end()); + C c; + assert ( c.begin() == std::begin(c)); + assert ( c.cbegin() == std::cbegin(c)); + assert ( c.rbegin() == std::rbegin(c)); + assert ( c.crbegin() == std::crbegin(c)); + assert ( c.end() == std::end(c)); + assert ( c.cend() == std::cend(c)); + assert ( c.rend() == std::rend(c)); + assert ( c.crend() == std::crend(c)); + + assert ( std::begin(c) == std::end(c)); + assert ( std::rbegin(c) == std::rend(c)); + assert ( std::cbegin(c) == std::cend(c)); + assert ( std::crbegin(c) == std::crend(c)); } } #endif diff --git a/test/iterators/iterator.range/begin-end.pass.cpp b/test/iterators/iterator.range/begin-end.pass.cpp index e8a6c18f..65d1a7bd 100644 --- a/test/iterators/iterator.range/begin-end.pass.cpp +++ b/test/iterators/iterator.range/begin-end.pass.cpp @@ -52,6 +52,7 @@ void test_const_container( const std::initializer_list & c, T val ) { assert ( std::end(c) == c.end()); #if _LIBCPP_STD_VER > 11 // initializer_list doesn't have cbegin/cend/rbegin/rend +// but std::cbegin(),etc work (b/c they're general fn templates) // assert ( std::cbegin(c) == c.cbegin()); // assert ( std::cbegin(c) != c.cend()); // assert ( std::cend(c) == c.cend());