Author: hans
Date: Thu Aug 11 16:48:37 2016
New Revision: 278426
URL: http://llvm.org/viewvc/llvm-project?rev=278426&view=rev
Log:
Merging r278282:
------------------------------------------------------------------------
r278282 | marshall | 2016-08-10 13:04:46 -0700 (Wed, 10 Aug 2016) | 1 line
std:: quailfy the calls for cend/crend/cbegin/cend. Fixes bug 28927.
------------------------------------------------------------------------
Added:
libcxx/branches/release_39/test/std/iterators/iterator.range/begin-end.fail.cpp
- copied unchanged from r278282,
libcxx/trunk/test/std/iterators/iterator.range/begin-end.fail.cpp
Modified:
libcxx/branches/release_39/ (props changed)
libcxx/branches/release_39/include/iterator
Propchange: libcxx/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 16:48:37 2016
@@ -1,2 +1,2 @@
/libcxx/branches/apple:136569-137939
-/libcxx/trunk:278387
+/libcxx/trunk:278282,278387
Modified: libcxx/branches/release_39/include/iterator
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_39/include/iterator?rev=278426&r1=278425&r2=278426&view=diff
==============================================================================
--- libcxx/branches/release_39/include/iterator (original)
+++ libcxx/branches/release_39/include/iterator Thu Aug 11 16:48:37 2016
@@ -1632,16 +1632,16 @@ reverse_iterator<const _Ep*> rend(initia
template <class _Cp>
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cbegin(const _Cp& __c) -> decltype(begin(__c))
+auto cbegin(const _Cp& __c) -> decltype(_VSTD::begin(__c))
{
- return begin(__c);
+ return _VSTD::begin(__c);
}
template <class _Cp>
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cend(const _Cp& __c) -> decltype(end(__c))
+auto cend(const _Cp& __c) -> decltype(_VSTD::end(__c))
{
- return end(__c);
+ return _VSTD::end(__c);
}
template <class _Cp>
@@ -1674,16 +1674,16 @@ auto rend(const _Cp& __c) -> decltype(__
template <class _Cp>
inline _LIBCPP_INLINE_VISIBILITY
-auto crbegin(const _Cp& __c) -> decltype(rbegin(__c))
+auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c))
{
- return rbegin(__c);
+ return _VSTD::rbegin(__c);
}
template <class _Cp>
inline _LIBCPP_INLINE_VISIBILITY
-auto crend(const _Cp& __c) -> decltype(rend(__c))
+auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))
{
- return rend(__c);
+ return _VSTD::rend(__c);
}
#endif
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
