25__tuple.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. diff --git a/include/__tuple/sfinae_helpers.h b/include/__tuple/sfinae_helpers.h
  2. index 2fffac9..ee55576 100644
  3. --- a/include/__tuple/sfinae_helpers.h
  4. +++ b/include/__tuple/sfinae_helpers.h
  5. @@ -49,22 +49,24 @@ struct __tuple_sfinae_base {
  6. static auto __do_test(...) -> false_type;
  7. template <class _FromArgs, class _ToArgs>
  8. - using __constructible = decltype(__do_test<is_constructible>(_ToArgs{}, _FromArgs{}));
  9. + using __constructible = decltype(__do_test<is_constructible>(declval<_ToArgs>(), declval<_FromArgs>()));
  10. template <class _FromArgs, class _ToArgs>
  11. - using __convertible = decltype(__do_test<is_convertible>(_FromArgs{}, _ToArgs{}));
  12. + using __convertible = decltype(__do_test<is_convertible>(declval<_FromArgs>(), declval<_ToArgs>()));
  13. template <class _FromArgs, class _ToArgs>
  14. - using __assignable = decltype(__do_test<is_assignable>(_ToArgs{}, _FromArgs{}));
  15. + using __assignable = decltype(__do_test<is_assignable>(declval<_ToArgs>(), declval<_FromArgs>()));
  16. };
  17. // __tuple_convertible
  18. template <class _Tp, class _Up, bool = __tuple_like_ext<__libcpp_remove_reference_t<_Tp> >::value,
  19. - bool = __tuple_like_ext<_Up>::value>
  20. + bool = __tuple_like_ext<_Up>::value,
  21. + class = void>
  22. struct __tuple_convertible
  23. : public false_type {};
  24. template <class _Tp, class _Up>
  25. -struct __tuple_convertible<_Tp, _Up, true, true>
  26. +struct __tuple_convertible<_Tp, _Up, true, true,
  27. + typename enable_if<(tuple_size<typename remove_reference<_Tp>::type>::value == tuple_size<_Up>::value)>::type>
  28. : public __tuple_sfinae_base::__convertible<
  29. typename __make_tuple_types<_Tp>::type
  30. , typename __make_tuple_types<_Up>::type
  31. diff --git a/include/__tuple/tuple_element.h b/include/__tuple/tuple_element.h
  32. index 478dd08..5d2c38f 100644
  33. --- a/include/__tuple/tuple_element.h
  34. +++ b/include/__tuple/tuple_element.h
  35. @@ -64,6 +64,7 @@ __indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&);
  36. } // namespace __indexer_detail
  37. +#if !defined(__CUDACC__) || !defined(_MSC_VER)
  38. template <size_t _Idx, class ..._Types>
  39. using __type_pack_element _LIBCPP_NODEBUG = typename decltype(
  40. __indexer_detail::__at_index<_Idx>(
  41. @@ -72,7 +73,21 @@ using __type_pack_element _LIBCPP_NODEBUG = typename decltype(
  42. typename __make_tuple_indices<sizeof...(_Types)>::type
  43. >{})
  44. )::type;
  45. -#endif
  46. +#else // !defined(__CUDACC__) || !defined(_MSC_VER)
  47. +template <size_t _Idx, class ..._Types>
  48. +struct __y_type_pack_element {
  49. + using __t1 = typename __make_tuple_indices<sizeof...(_Types)>::type;
  50. + using __t2 = __indexer_detail::__indexer<__tuple_types<_Types...>, __t1>;
  51. + using __t3 = decltype(__indexer_detail::__at_index<_Idx>(__t2{}));
  52. + using __t4 = typename __t3::type;
  53. +};
  54. +
  55. +template <size_t _Idx, class ..._Types>
  56. +using __type_pack_element = typename __y_type_pack_element<_Idx, _Types...>::__t4;
  57. +
  58. +#endif // !defined(__CUDACC__) || !defined(_MSC_VER)
  59. +
  60. +#endif // __has_builtin(__type_pack_element)
  61. template <size_t _Ip, class ..._Types>
  62. struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> >