From 8070ded69951abbe4d16251170a246046c23fcac Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 12 Dec 2013 07:07:15 +0000 Subject: [PATCH] Merging r197061: ------------------------------------------------------------------------ r197061 | marshall | 2013-12-11 11:32:32 -0800 (Wed, 11 Dec 2013) | 1 line Move std::begin(array) and std::end(array) out from under an #ifdef that was preventing people from building libc++ using gcc. This corrects a mistake that I introduced in r196058 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/libcxx/branches/release_34@197134 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/iterator | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/iterator b/include/iterator index 1c59919e..70a664d9 100644 --- a/include/iterator +++ b/include/iterator @@ -1385,8 +1385,6 @@ operator+(typename __wrap_iter<_Iter>::difference_type __n, return __x; } -#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN) - template inline _LIBCPP_INLINE_VISIBILITY _Tp* @@ -1403,6 +1401,8 @@ end(_Tp (&__array)[_Np]) return __array + _Np; } +#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN) + template inline _LIBCPP_INLINE_VISIBILITY auto