diff options
| -rw-r--r-- | libcxx/include/iterator | 6 | ||||
| -rw-r--r-- | libcxx/include/tuple | 6 | ||||
| -rw-r--r-- | libcxx/include/utility | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libcxx/include/iterator b/libcxx/include/iterator index 70a664d9909..c6dd03340a7 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -364,10 +364,10 @@ public: static const bool value = sizeof(__test<_Tp>(0)) == 1; }; -template <class _Iter, bool> struct ____iterator_traits {}; +template <class _Iter, bool> struct __iterator_traits_impl {}; template <class _Iter> -struct ____iterator_traits<_Iter, true> +struct __iterator_traits_impl<_Iter, true> { typedef typename _Iter::difference_type difference_type; typedef typename _Iter::value_type value_type; @@ -380,7 +380,7 @@ template <class _Iter, bool> struct __iterator_traits {}; template <class _Iter> struct __iterator_traits<_Iter, true> - : ____iterator_traits + : __iterator_traits_impl < _Iter, is_convertible<typename _Iter::iterator_category, input_iterator_tag>::value || diff --git a/libcxx/include/tuple b/libcxx/include/tuple index a1a7bcf0b5e..24e086db588 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -816,13 +816,13 @@ namespace { const __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>() template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper; template <class _Tp> -struct ___make_tuple_return +struct __make_tuple_return_impl { typedef _Tp type; }; template <class _Tp> -struct ___make_tuple_return<reference_wrapper<_Tp> > +struct __make_tuple_return_impl<reference_wrapper<_Tp> > { typedef _Tp& type; }; @@ -830,7 +830,7 @@ struct ___make_tuple_return<reference_wrapper<_Tp> > template <class _Tp> struct __make_tuple_return { - typedef typename ___make_tuple_return<typename decay<_Tp>::type>::type type; + typedef typename __make_tuple_return_impl<typename decay<_Tp>::type>::type type; }; template <class... _Tp> diff --git a/libcxx/include/utility b/libcxx/include/utility index 2c1f62ccbe9..0a1a7f1d923 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -465,13 +465,13 @@ swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y) template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper; template <class _Tp> -struct ___make_pair_return +struct __make_pair_return_impl { typedef _Tp type; }; template <class _Tp> -struct ___make_pair_return<reference_wrapper<_Tp>> +struct __make_pair_return_impl<reference_wrapper<_Tp>> { typedef _Tp& type; }; @@ -479,7 +479,7 @@ struct ___make_pair_return<reference_wrapper<_Tp>> template <class _Tp> struct __make_pair_return { - typedef typename ___make_pair_return<typename decay<_Tp>::type>::type type; + typedef typename __make_pair_return_impl<typename decay<_Tp>::type>::type type; }; template <class _T1, class _T2> |
