From f88992e2f7965921838fdee5dc9c709f2f37e09d Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 1 Jun 2015 17:20:02 -0400 Subject: [PATCH] cuda can't handle invoking worklets from anonymous namespaces. --- vtkm/worklet/testing/UnitTestWorkletMapField.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx index 94bf75e67..204a880e3 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx @@ -73,7 +73,7 @@ public: } // worklet namespace -namespace { +namespace mapfield{ static const vtkm::Id ARRAY_SIZE = 10; @@ -123,12 +123,12 @@ void TestWorkletMapField() std::cout << "--- Worklet accepting all types." << std::endl; vtkm::testing::Testing::TryTypes( - DoTestWorklet< ::worklets::TestWorklet >(), + mapfield::DoTestWorklet< ::worklets::TestWorklet >(), vtkm::TypeListTagCommon()); std::cout << "--- Worklet accepting some types." << std::endl; vtkm::testing::Testing::TryTypes( - DoTestWorklet< ::worklets::TestWorkletLimitedTypes >(), + mapfield::DoTestWorklet< ::worklets::TestWorkletLimitedTypes >(), vtkm::TypeListTagFieldScalar()); std::cout << "--- Sending bad type to worklet." << std::endl; @@ -148,5 +148,5 @@ void TestWorkletMapField() int UnitTestWorkletMapField(int, char *[]) { - return vtkm::cont::testing::Testing::Run(TestWorkletMapField); + return vtkm::cont::testing::Testing::Run(mapfield::TestWorkletMapField); }