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

remove using namespace, specify fully qualified names

Browse Source
This commit is contained in:
Li-Ta Lo 2018-05-02 13:53:07 -06:00
parent ae5e3be89b
commit d3dbdd596f
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/worklet/testing/UnitTestCellSetConnectivity.cpp
View File

@ -28,8 +28,6 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
using namespace vtkm::worklet::connectivity;
class TangleField : public vtkm::worklet::WorkletMapField
{
public:
@ -142,7 +140,7 @@ public:
auto cellSet = outputData.GetCellSet().Cast<vtkm::cont::CellSetSingleType<>>();
vtkm::cont::ArrayHandle<vtkm::Id> componentArray;
CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
vtkm::worklet::connectivity::CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>;
Algorithm::Sort(componentArray);
@ -157,7 +155,7 @@ public:
auto cellSet = dataSet.GetCellSet().Cast<vtkm::cont::CellSetExplicit<>>();
vtkm::cont::ArrayHandle<vtkm::Id> componentArray;
CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
vtkm::worklet::connectivity::CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>;
Algorithm::Sort(componentArray);
@ -172,7 +170,7 @@ public:
auto cellSet = dataSet.GetCellSet();
vtkm::cont::ArrayHandle<vtkm::Id> componentArray;
CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
vtkm::worklet::connectivity::CellSetConnectivity().Run(cellSet, componentArray, DeviceAdapter());
using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>;
Algorithm::Sort(componentArray);

4
vtkm/worklet/testing/UnitTestCellSetDualGraph.cxx
View File

@ -25,8 +25,6 @@
#include <vtkm/worklet/connectivities/CellSetDualGraph.h>
using namespace vtkm::worklet::connectivity;
template <typename DeviceAdapter>
class TestCellSetDualGraph
{
@ -64,7 +62,7 @@ public:
vtkm::cont::ArrayHandle<vtkm::Id> indexOffsetArray;
vtkm::cont::ArrayHandle<vtkm::Id> connectivityArray;
CellSetDualGraph<DeviceAdapter>().Run(
vtkm::worklet::connectivity::CellSetDualGraph<DeviceAdapter>().Run(
cellSet, numIndicesArray, indexOffsetArray, connectivityArray);
vtkm::Id expectedNumIndices[] = { 1, 1, 3, 1, 1, 1 };

3
vtkm/worklet/testing/UnitTestImageConnectivity.cpp
View File

@ -25,7 +25,6 @@
#include <vtkm/worklet/connectivities/ImageConnectivity.h>
using namespace vtkm::worklet::connectivity;
template <typename DeviceAdapter>
class TestImageConnectivity
@ -50,7 +49,7 @@ public:
data.AddField(colorField);
vtkm::cont::ArrayHandle<vtkm::Id> component;
ImageConnectivity().Run(data.GetCellSet(0).Cast<vtkm::cont::CellSetStructured<2>>(),
vtkm::worklet::connectivity::ImageConnectivity().Run(data.GetCellSet(0).Cast<vtkm::cont::CellSetStructured<2>>(),
colorField.GetData(), component, DeviceAdapter());
std::vector<vtkm::Id> componentExpected = {

4
vtkm/worklet/testing/UnitTestInnerJoin.cxx
View File

@ -23,7 +23,6 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/worklet/connectivities/InnerJoin.h>
using namespace vtkm::worklet::connectivity;
template <typename DeviceAdapter>
class TestInnerJoin
@ -69,7 +68,8 @@ public:
vtkm::cont::ArrayHandle<vtkm::Id> outA;
vtkm::cont::ArrayHandle<vtkm::Id> outB;
InnerJoin<DeviceAdapter>().Run(A_arr, idxA, B_arr, idxB, joinedIndex, outA, outB);
vtkm::worklet::connectivity::InnerJoin<DeviceAdapter>().Run(
A_arr, idxA, B_arr, idxB, joinedIndex, outA, outB);
vtkm::Id expectedIndex[] = { 5, 5, 8, 8, 9 };
VTKM_TEST_ASSERT(TestArrayHandle(joinedIndex, expectedIndex, 5), "Wrong joined keys");