[libcxx] r197134 - Merging r197061:

[Bill Wendling]

Author: void
Date: Thu Dec 12 01:07:15 2013
New Revision: 197134

URL: http://llvm.org/viewvc/llvm-project?rev=197134&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_34/   (props changed)
    libcxx/branches/release_34/include/iterator

Propchange: libcxx/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 12 01:07:15 2013
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:195136,195143,195693,196058
+/libcxx/trunk:195136,195143,195693,196058,197061

Modified: libcxx/branches/release_34/include/iterator
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_34/include/iterator?rev=197134&r1=197133&r2=197134&view=diff
==============================================================================
--- libcxx/branches/release_34/include/iterator (original)
+++ libcxx/branches/release_34/include/iterator Thu Dec 12 01:07:15 2013
@@ -1385,8 +1385,6 @@ operator+(typename __wrap_iter<_Iter>::d
     return __x;
 }
 
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
 template <class _Tp, size_t _Np>
 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 <class _Cp>
 inline _LIBCPP_INLINE_VISIBILITY
 auto