Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-inappropriate-virtual-method'

Browse Source 
c0b780543 Fix an inappropriate use of virtual methods in an execution test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2011
This commit is contained in:
Kenneth Moreland 2020-03-25 15:28:35 +00:00 committed by Kitware Robot
commit 287a6f8b9b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtkm/worklet/testing/UnitTestScatterAndMaskWithTopology.cxx
View File

@ -26,12 +26,6 @@ class TestWorkletMapTopo : public vtkm::worklet::WorkletVisitPointsWithCells
public: public:
using ControlSignature = void(CellSetIn topology, FieldInVisit pointCoords); using ControlSignature = void(CellSetIn topology, FieldInVisit pointCoords);
using ExecutionSignature = void(_2, WorkIndex, InputIndex, OutputIndex, VisitIndex); using ExecutionSignature = void(_2, WorkIndex, InputIndex, OutputIndex, VisitIndex);
virtual VTKM_EXEC void operator()(const vtkm::Vec<int, 3>& vtkmNotUsed(coords),
const vtkm::Id& workIndex,
const vtkm::Id& inputIndex,
const vtkm::Id& outputIndex,
const vtkm::Id& visitIndex) const = 0;
}; };
class TestWorkletMapTopoIdentity : public TestWorkletMapTopo class TestWorkletMapTopoIdentity : public TestWorkletMapTopo
@ -43,7 +37,7 @@ public:
const vtkm::Id& workIndex, const vtkm::Id& workIndex,
const vtkm::Id& inputIndex, const vtkm::Id& inputIndex,
const vtkm::Id& outputIndex, const vtkm::Id& outputIndex,
const vtkm::Id& visitIndex) const override const vtkm::Id& visitIndex) const
{ {
if (workIndex != inputIndex) if (workIndex != inputIndex)
{ {
@ -69,7 +63,7 @@ public:
const vtkm::Id& workIndex, const vtkm::Id& workIndex,
const vtkm::Id& inputIndex, const vtkm::Id& inputIndex,
const vtkm::Id& outputIndex, const vtkm::Id& outputIndex,
const vtkm::Id& visitIndex) const override const vtkm::Id& visitIndex) const
{ {
if ((workIndex / 2) != inputIndex) if ((workIndex / 2) != inputIndex)
{ {
@ -95,7 +89,7 @@ public:
const vtkm::Id& workIndex, const vtkm::Id& workIndex,
const vtkm::Id& inputIndex, const vtkm::Id& inputIndex,
const vtkm::Id& outputIndex, const vtkm::Id& outputIndex,
const vtkm::Id& visitIndex) const override const vtkm::Id& visitIndex) const
{ {
if (workIndex != inputIndex) if (workIndex != inputIndex)
{ {
@ -121,7 +115,7 @@ public:
const vtkm::Id& vtkmNotUsed(workIndex), const vtkm::Id& vtkmNotUsed(workIndex),
const vtkm::Id& vtkmNotUsed(inputIndex), const vtkm::Id& vtkmNotUsed(inputIndex),
const vtkm::Id& vtkmNotUsed(outputIndex), const vtkm::Id& vtkmNotUsed(outputIndex),
const vtkm::Id& vtkmNotUsed(visitIndex)) const override const vtkm::Id& vtkmNotUsed(visitIndex)) const
{ {
// This method should never be called // This method should never be called
this->RaiseError("An element was selected, this test selects none."); this->RaiseError("An element was selected, this test selects none.");