Commit c0caf4fa authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'warnings-from-vtk'

482266b4 Particle: explicitly make the copy ctor and assignment op
1037aa75 AssignerPartitionedDataSet: mark dtor as override
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !2259
parents 0e6529eb 482266b4
......@@ -129,6 +129,13 @@ public:
VTKM_EXEC_CONT
Particle() {}
VTKM_EXEC_CONT Particle(const vtkm::Particle& rhs)
: ParticleBase(rhs)
{
// This must not be defaulted, since defaulted copy constructors are
// troublesome with CUDA __host__ __device__ markup.
}
VTKM_EXEC_CONT ~Particle() noexcept override
{
// This must not be defaulted, since defaulted virtual destructors are
......@@ -146,6 +153,19 @@ public:
{
}
VTKM_EXEC_CONT Particle& operator=(const vtkm::Particle& rhs)
{
// This must not be defaulted, since defaulted assignment operators are
// troublesome with CUDA __host__ __device__ markup.
if (&rhs == this)
{
return *this;
}
vtkm::ParticleBase::operator=(rhs);
return *this;
}
VTKM_EXEC_CONT
vtkm::Vec3f Next(const vtkm::VecVariable<vtkm::Vec3f, 2>& vectors,
const vtkm::FloatDefault& length) override
......
......@@ -59,7 +59,7 @@ public:
AssignerPartitionedDataSet(vtkm::Id num_partitions);
VTKM_CONT
virtual ~AssignerPartitionedDataSet();
~AssignerPartitionedDataSet() override;
///@{
/// vtkmdiy::Assigner API implementation.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment