Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Fix _EnableConstructor to be dependent on a template argument #388

Merged
merged 8 commits into from
Mar 10, 2023
+124 −133
Merged

Fix _EnableConstructor to be dependent on a template argument #388

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6207cc0
Fix `_EnableConstructor` to be dependent on a template argument so th…
miscco Mar 10, 2023
89921ed
Mark `<memory_resource>` as unsupported on windows
miscco Mar 10, 2023
32e6cd2
Disable `stream_ref` for nvrtc
miscco Mar 10, 2023
16b5228
Fix symbol clashin issues with `forward_property`
miscco Mar 10, 2023
50b9789
Mark `<memory_resource>` as unsupported on nvrtc
miscco Mar 10, 2023
69c7d72
Reenable tests that are now passing after we do not include concepts …
miscco Mar 10, 2023
bf7f8ee
Reenable passing tests
miscco Mar 10, 2023
2f3aefa
Remove //XFAIL for 2019 msvc that would ICE
wmaxey Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions include/cuda/std/detail/libcxx/include/tuple
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,23 +739,24 @@ class _LIBCUDACXX_TEMPLATE_VIS tuple
const typename tuple_element<_Jp, tuple<_Up...> >::type&& get(const tuple<_Up...>&&) _NOEXCEPT;
public:

template<bool _Dummy>
struct _EnableConstructor {
static constexpr bool __implicit_default =
_CheckArgsConstructor<true>::template __enable_implicit_default<>::value;
_CheckArgsConstructor<_Dummy>::template __enable_implicit_default<>::value;
static constexpr bool __explicit_default =
_CheckArgsConstructor<true>::template __enable_explicit_default<>::value;
_CheckArgsConstructor<_Dummy>::template __enable_explicit_default<>::value;

static constexpr bool __implicit_variadic =
_CheckArgsConstructor<true>::template __enable_implicit<_Tp const&...>::value;
_CheckArgsConstructor<_Dummy>::template __enable_implicit<_Tp const&...>::value;
static constexpr bool __explicit_variadic =
_CheckArgsConstructor<true>::template __enable_explicit<_Tp const&...>::value;
_CheckArgsConstructor<_Dummy>::template __enable_explicit<_Tp const&...>::value;
};

template <class _Enable = _EnableConstructor, __enable_if_t<_Enable::__implicit_default, bool> = false>
template <bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__implicit_default, bool> = false>
_LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR
tuple() _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}

template <class _Enable = _EnableConstructor, __enable_if_t<_Enable::__explicit_default, bool> = false>
template <bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__explicit_default, bool> = false>
explicit _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR
tuple() _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}

Expand Down Expand Up @@ -788,7 +789,7 @@ public:
typename __make_tuple_indices<sizeof...(_Tp), 0>::type(),
__tuple_types<_Tp...>()) {}

template <class _Enable = _EnableConstructor, __enable_if_t<_Enable::__implicit_variadic, bool> = false>
template <bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__implicit_variadic, bool> = false>
_LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11
tuple(const _Tp& ... __t) _NOEXCEPT_((__all<is_nothrow_copy_constructible<_Tp>::value...>::value))
: __base_(typename __make_tuple_indices<sizeof...(_Tp)>::type(),
Expand All @@ -798,7 +799,7 @@ public:
__t...
) {}

template <class _Enable = _EnableConstructor, __enable_if_t<_Enable::__explicit_variadic, bool> = false>
template <bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__explicit_variadic, bool> = false>
_LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11
explicit tuple(const _Tp& ... __t) _NOEXCEPT_((__all<is_nothrow_copy_constructible<_Tp>::value...>::value))
: __base_(typename __make_tuple_indices<sizeof...(_Tp)>::type(),
Expand All @@ -808,8 +809,7 @@ public:
__t...
) {}

template <class _Alloc, class _Enable = _EnableConstructor,
__enable_if_t<_Enable::__implicit_variadic, bool> = false>
template <class _Alloc, bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__implicit_variadic, bool> = false>
_LIBCUDACXX_INLINE_VISIBILITY
tuple(allocator_arg_t, const _Alloc& __a, const _Tp& ... __t)
: __base_(allocator_arg_t(), __a,
Expand All @@ -820,8 +820,7 @@ public:
__t...
) {}

template <class _Alloc, class _Enable = _EnableConstructor,
__enable_if_t<_Enable::__explicit_variadic, bool> = false>
template <class _Alloc, bool _Dummy = true, __enable_if_t<_EnableConstructor<_Dummy>::__explicit_variadic, bool> = false>
_LIBCUDACXX_INLINE_VISIBILITY
explicit
tuple(allocator_arg_t, const _Alloc& __a, const _Tp& ... __t)
Expand Down