mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 21:33:55 +00:00
Avoid is_trivially_copyable on VariantUnion
For some reason some versions of the CUDA compiler would return true for `is_trivially_copyable` on a `VariantUnion` even when the types of the union caused the copy constructor to get deleted. Solve the problem by using `AllTriviallyCopyable` instead of directly caling `is_trivially_copyable` on the union.
This commit is contained in:
parent
cb60401a63
commit
cad5dc7b71
@ -93,7 +93,7 @@ struct VariantTriviallyCopyable;
|
|||||||
|
|
||||||
template <typename... Ts>
|
template <typename... Ts>
|
||||||
struct VariantTriviallyCopyable<vtkm::VTK_M_NAMESPACE::internal::Variant<Ts...>>
|
struct VariantTriviallyCopyable<vtkm::VTK_M_NAMESPACE::internal::Variant<Ts...>>
|
||||||
: vtkmstd::is_trivially_copyable<VariantUnion<Ts...>>
|
: AllTriviallyCopyable<Ts...>
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -102,7 +102,7 @@ struct VariantTriviallyConstructible;
|
|||||||
|
|
||||||
template <typename... Ts>
|
template <typename... Ts>
|
||||||
struct VariantTriviallyConstructible<vtkm::VTK_M_NAMESPACE::internal::Variant<Ts...>>
|
struct VariantTriviallyConstructible<vtkm::VTK_M_NAMESPACE::internal::Variant<Ts...>>
|
||||||
: vtkmstd::is_trivially_constructible<VariantUnion<Ts...>>
|
: AllTriviallyConstructible<Ts...>
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user