diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-09 12:32:46 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 15:58:17 +0300 |
| commit | 04f92333c6c89b088631d1f7db4e740ff57f13ee (patch) | |
| tree | 3bb3568b358cf094b3fdbf80d98bbcff603495a8 /contrib/libs/cxxsupp/libcxx/include/tuple | |
| parent | 9d2d09b39009529a9fda06a8c6c4c146c28fa6e0 (diff) | |
| download | ydb-04f92333c6c89b088631d1f7db4e740ff57f13ee.tar.gz | |
intermediate changes
ref:85ad5d6a296c4e63da5080260ed5ed41345158e6
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/include/tuple')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/tuple | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/tuple b/contrib/libs/cxxsupp/libcxx/include/tuple index be57f984dd..9b127953b3 100644 --- a/contrib/libs/cxxsupp/libcxx/include/tuple +++ b/contrib/libs/cxxsupp/libcxx/include/tuple @@ -132,14 +132,11 @@ template <class T1, class... T> // 20.4.1.6, relational operators: template<class... T, class... U> bool operator==(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 -template<class... T, class... U> bool operator<(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14, removed in C++20 -template<class... T, class... U> bool operator!=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14, removed in C++20 -template<class... T, class... U> bool operator>(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14, removed in C++20 -template<class... T, class... U> bool operator<=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14, removed in C++20 -template<class... T, class... U> bool operator>=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14, removed in C++20 -template<class... T, class... U> - constexpr common_comparison_category_t<synth-three-way-result<T, U>...> - operator<=>(const tuple<T...>&, const tuple<U...>&); // since C++20 +template<class... T, class... U> bool operator<(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 +template<class... T, class... U> bool operator!=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 +template<class... T, class... U> bool operator>(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 +template<class... T, class... U> bool operator<=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 +template<class... T, class... U> bool operator>=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14 template <class... Types, class Alloc> struct uses_allocator<tuple<Types...>, Alloc>; @@ -152,8 +149,6 @@ template <class... Types> */ -#include <__compare/common_comparison_category.h> -#include <__compare/synth_three_way.h> #include <__config> #include <__functional/unwrap_ref.h> #include <__functional_base> @@ -161,7 +156,6 @@ template <class... Types> #include <__memory/uses_allocator.h> #include <__tuple> #include <__utility/forward.h> -#include <__utility/integer_sequence.h> #include <__utility/move.h> #include <compare> #include <cstddef> @@ -1323,30 +1317,6 @@ operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) return __tuple_equal<sizeof...(_Tp)>()(__x, __y); } -#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_SPACESHIP_OPERATOR) && !defined(_LIBCPP_HAS_NO_CONCEPTS) - -// operator<=> - -template <class ..._Tp, class ..._Up, size_t ..._Is> -_LIBCPP_HIDE_FROM_ABI constexpr -auto -__tuple_compare_three_way(const tuple<_Tp...>& __x, const tuple<_Up...>& __y, index_sequence<_Is...>) { - common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...> __result = strong_ordering::equal; - static_cast<void>(((__result = _VSTD::__synth_three_way(_VSTD::get<_Is>(__x), _VSTD::get<_Is>(__y)), __result != 0) || ...)); - return __result; -} - -template <class ..._Tp, class ..._Up> -requires (sizeof...(_Tp) == sizeof...(_Up)) -_LIBCPP_HIDE_FROM_ABI constexpr -common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...> -operator<=>(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) -{ - return _VSTD::__tuple_compare_three_way(__x, __y, index_sequence_for<_Tp...>{}); -} - -#else // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_SPACESHIP_OPERATOR) && !defined(_LIBCPP_HAS_NO_CONCEPTS) - template <class ..._Tp, class ..._Up> inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 bool @@ -1415,8 +1385,6 @@ operator<=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) return !(__y < __x); } -#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_SPACESHIP_OPERATOR) && !defined(_LIBCPP_HAS_NO_CONCEPTS) - // tuple_cat template <class _Tp, class _Up> struct __tuple_cat_type; |