diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2025-03-25 19:22:33 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2025-03-25 19:39:37 +0300 |
| commit | 8c5737c8d393a14c8e82f80fdad4c5f3a2c0824a (patch) | |
| tree | 3236571c8e9d71bb4835f0ca4524f5758a1aa9a4 /contrib | |
| parent | 7f76c117dea37972bb6b4876333d92182dc757b5 (diff) | |
| download | ydb-8c5737c8d393a14c8e82f80fdad4c5f3a2c0824a.tar.gz | |
Remove patch for cuda from tuple
commit_hash:97309728252215cd81766811e8719e44e1911010
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__tuple/tuple_element.h | 17 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/patches/25__tuple.patch | 32 |
2 files changed, 1 insertions, 48 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__tuple/tuple_element.h b/contrib/libs/cxxsupp/libcxx/include/__tuple/tuple_element.h index c6818f227bd..55b3b47619f 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__tuple/tuple_element.h +++ b/contrib/libs/cxxsupp/libcxx/include/__tuple/tuple_element.h @@ -60,26 +60,11 @@ __indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&); } // namespace __indexer_detail -# if !defined(__CUDACC__) || !defined(_MSC_VER) template <size_t _Idx, class... _Types> using __type_pack_element _LIBCPP_NODEBUG = typename decltype(__indexer_detail::__at_index<_Idx>( __indexer_detail::__indexer< __tuple_types<_Types...>, typename __make_tuple_indices<sizeof...(_Types)>::type >{}))::type; -# else // !defined(__CUDACC__) || !defined(_MSC_VER) -template <size_t _Idx, class... _Types> -struct __y_type_pack_element { - using __t1 = typename __make_tuple_indices<sizeof...(_Types)>::type; - using __t2 = __indexer_detail::__indexer<__tuple_types<_Types...>, __t1>; - using __t3 = decltype(__indexer_detail::__at_index<_Idx>(__t2{})); - using __t4 = typename __t3::type; -}; - -template <size_t _Idx, class... _Types> -using __type_pack_element = typename __y_type_pack_element<_Idx, _Types...>::__t4; - -# endif // !defined(__CUDACC__) || !defined(_MSC_VER) - -# endif // __has_builtin(__type_pack_element) +# endif template <size_t _Ip, class... _Types> struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> > { diff --git a/contrib/libs/cxxsupp/libcxx/patches/25__tuple.patch b/contrib/libs/cxxsupp/libcxx/patches/25__tuple.patch index 627c70c2c50..2011507f3a6 100644 --- a/contrib/libs/cxxsupp/libcxx/patches/25__tuple.patch +++ b/contrib/libs/cxxsupp/libcxx/patches/25__tuple.patch @@ -31,35 +31,3 @@ index c7145e0..7db5eeb 100644 : public __tuple_sfinae_base::__constructible< typename __make_tuple_types<_Tp>::type, typename __make_tuple_types<_Up>::type > {}; -diff --git a/include/__tuple/tuple_element.h b/include/__tuple/tuple_element.h -index 55b3b47..c6818f2 100644 ---- a/include/__tuple/tuple_element.h -+++ b/include/__tuple/tuple_element.h -@@ -60,11 +60,26 @@ __indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&); - - } // namespace __indexer_detail - -+# if !defined(__CUDACC__) || !defined(_MSC_VER) - template <size_t _Idx, class... _Types> - using __type_pack_element _LIBCPP_NODEBUG = typename decltype(__indexer_detail::__at_index<_Idx>( - __indexer_detail::__indexer< __tuple_types<_Types...>, - typename __make_tuple_indices<sizeof...(_Types)>::type >{}))::type; --# endif -+# else // !defined(__CUDACC__) || !defined(_MSC_VER) -+template <size_t _Idx, class... _Types> -+struct __y_type_pack_element { -+ using __t1 = typename __make_tuple_indices<sizeof...(_Types)>::type; -+ using __t2 = __indexer_detail::__indexer<__tuple_types<_Types...>, __t1>; -+ using __t3 = decltype(__indexer_detail::__at_index<_Idx>(__t2{})); -+ using __t4 = typename __t3::type; -+}; -+ -+template <size_t _Idx, class... _Types> -+using __type_pack_element = typename __y_type_pack_element<_Idx, _Types...>::__t4; -+ -+# endif // !defined(__CUDACC__) || !defined(_MSC_VER) -+ -+# endif // __has_builtin(__type_pack_element) - - template <size_t _Ip, class... _Types> - struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> > { |