diff options
| -rw-r--r-- | libcxx/include/tuple | 18 | ||||
| -rw-r--r-- | libcxx/include/utility | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libcxx/include/tuple b/libcxx/include/tuple index 3a22aa5ff5a..837be6fa1c2 100644 --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -80,26 +80,26 @@ template <class... Tuples> tuple<CTypes...> tuple_cat(Tuples&&... tpls); // cons // 20.4.1.4, tuple helper classes: template <class T> class tuple_size; // undefined template <class... T> class tuple_size<tuple<T...>>; -template <intsize_t I, class T> class tuple_element; // undefined -template <intsize_t I, class... T> class tuple_element<I, tuple<T...>>; -template <size_t _Ip, class ..._Tp> - using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; // C++14 +template <size_t I, class T> class tuple_element; // undefined +template <size_t I, class... T> class tuple_element<I, tuple<T...>>; +template <size_t I, class T> + using tuple_element_t = typename tuple_element <I, T>::type; // C++14 // 20.4.1.5, element access: -template <intsize_t I, class... T> +template <size_t I, class... T> typename tuple_element<I, tuple<T...>>::type& get(tuple<T...>&) noexcept; // constexpr in C++14 -template <intsize_t I, class... T> - typename const tuple_element<I, tuple<T...>>::type & +template <size_t I, class... T> + const typename tuple_element<I, tuple<T...>>::type& get(const tuple<T...>&) noexcept; // constexpr in C++14 -template <intsize_t I, class... T> +template <size_t I, class... T> typename tuple_element<I, tuple<T...>>::type&& get(tuple<T...>&&) noexcept; // constexpr in C++14 template <class T1, class... T> constexpr T1& get(tuple<T...>&) noexcept; // C++14 template <class T1, class... T> - constexpr T1 const& get(const tuple<T...>&) noexcept; // C++14 + constexpr const T1& get(const tuple<T...>&) noexcept; // C++14 template <class T1, class... T> constexpr T1&& get(tuple<T...>&&) noexcept; // C++14 diff --git a/libcxx/include/utility b/libcxx/include/utility index 29753206ae7..d476c6b0848 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -113,7 +113,7 @@ template<size_t I, class T1, class T2> get(pair<T1, T2>&) noexcept; // constexpr in C++14 template<size_t I, class T1, class T2> - const typename const tuple_element<I, pair<T1, T2> >::type& + const typename tuple_element<I, pair<T1, T2> >::type& get(const pair<T1, T2>&) noexcept; // constexpr in C++14 template<size_t I, class T1, class T2> @@ -124,7 +124,7 @@ template<class T1, class T2> constexpr T1& get(pair<T1, T2>&) noexcept; // C++14 template<size_t I, class T1, class T2> - constexpr T1 const& get(pair<T1, T2> const &) noexcept; // C++14 + constexpr const T1& get(const pair<T1, T2>&) noexcept; // C++14 template<size_t I, class T1, class T2> constexpr T1&& get(pair<T1, T2>&&) noexcept; // C++14 |
