Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure each worklet test uses a different namespace.

Browse Source 
Otherwise NVCC compiler has issues are we are breaking ODR, since it smashes
all these files into a single compilation unit.
This commit is contained in:
Robert Maynard 2015-06-08 09:02:23 -04:00
parent bdbced9c4f
commit eb572169a5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx
View File

@ -30,7 +30,7 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
namespace test {
namespace test_explicit {
class MaxNodeOrCellValue : public vtkm::worklet::WorkletMapTopology
{
@ -167,7 +167,7 @@ TestMaxNodeOrCell()
//derived implementation. The vtkm::cont::CellSet should have
//a method that return the nodesOfCellsConnectivity / structure
//for that derived type. ( talk to robert for how dax did this )
vtkm::worklet::DispatcherMapTopology< ::test::MaxNodeOrCellValue > dispatcher;
vtkm::worklet::DispatcherMapTopology< ::test_explicit::MaxNodeOrCellValue > dispatcher;
dispatcher.Invoke(ds.GetField("cellvar").GetData(),
ds.GetField("nodevar").GetData(),
cse->GetNodeToCellConnectivity(),
@ -208,7 +208,7 @@ TestAvgNodeToCell()
VTKM_TEST_ASSERT(cse, "Expected an explicit cell set");
vtkm::worklet::DispatcherMapTopology< ::test::AvgNodeToCellValue > dispatcher;
vtkm::worklet::DispatcherMapTopology< ::test_explicit::AvgNodeToCellValue > dispatcher;
dispatcher.Invoke(ds.GetField("nodevar").GetData(),
cse->GetNodeToCellConnectivity(),
ds.GetField("outcellvar").GetData());

6
vtkm/worklet/testing/UnitTestWorkletMapTopologyRegular.cxx
View File

@ -31,7 +31,7 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
namespace test {
namespace test_regular {
class MaxNodeOrCellValue : public vtkm::worklet::WorkletMapTopology
{
@ -166,7 +166,7 @@ TestMaxNodeOrCell()
//derived implementation. The vtkm::cont::CellSet should have
//a method that return the nodesOfCellsConnectivity / structure
//for that derived type. ( talk to robert for how dax did this )
vtkm::worklet::DispatcherMapTopology< ::test::MaxNodeOrCellValue > dispatcher;
vtkm::worklet::DispatcherMapTopology< ::test_regular::MaxNodeOrCellValue > dispatcher;
dispatcher.Invoke(ds.GetField("cellvar").GetData(),
ds.GetField("nodevar").GetData(),
cs->GetNodeToCellConnectivity(),
@ -210,7 +210,7 @@ TestAvgNodeToCell()
//derived implementation. The vtkm::cont::CellSet should have
//a method that return the nodesOfCellsConnectivity / structure
//for that derived type. ( talk to robert for how dax did this )
vtkm::worklet::DispatcherMapTopology< ::test::AvgNodeToCellValue > dispatcher;
vtkm::worklet::DispatcherMapTopology< ::test_regular::AvgNodeToCellValue > dispatcher;
dispatcher.Invoke(ds.GetField("nodevar").GetData(),
cs->GetNodeToCellConnectivity(),
ds.GetField("outcellvar").GetData());