Revert BoundingIntervalHierarchy.hxx back into existence.

CMake/VTKmCompilerFlags.cmake

@@ -120,12 +120,14 @@ elseif(VTKM_COMPILER_IS_ICC)
 
 elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG)
   set(cxx_flags -Wall -Wcast-align -Wchar-subscripts -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused-parameter -fno-common)
+  set(cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common)
   if (VTKM_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.99)
     list(APPEND cxx_flags -Wfloat-conversion)
+    set(cuda_flags "${cuda_flags},-Wfloat-conversion")
   elseif (VTKM_COMPILER_IS_CLANG)
     list(APPEND cxx_flags -Wconversion)
+    set(cuda_flags "${cuda_flags},-Wconversion")
   endif()
-  set(cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wconversion,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common)
 
   #GCC 5, 6 don't properly handle strict-overflow suppression through pragma's.
   #Instead of suppressing around the location of the strict-overflow you

vtkm/cont/BoundingIntervalHierarchy.h

@@ -36,7 +36,7 @@ namespace vtkm
 {
 namespace cont
 {
-class VTKM_CONT_EXPORT BoundingIntervalHierarchy : public vtkm::cont::CellLocator
+class VTKM_ALWAYS_EXPORT BoundingIntervalHierarchy : public vtkm::cont::CellLocator
 {
 private:
   using IdArrayHandle = vtkm::cont::ArrayHandle<vtkm::Id>;

vtkm/cont/CMakeLists.txt

@@ -166,7 +166,6 @@ set(sources
 # compiled with a device-specific compiler (like CUDA).
 set(device_sources
   ArrayRangeCompute.cxx
-  BoundingIntervalHierarchy.cxx
   CellSetExplicit.cxx
   CoordinateSystem.cxx
   StorageVirtual.cxx

vtkm/cont/CellLocator.h

@@ -28,6 +28,8 @@
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/ExecutionObjectBase.h>
 #include <vtkm/cont/VirtualObjectHandle.h>
+
+#include <vtkm/exec/BoundingIntervalHierarchyExec.h>
 #include <vtkm/exec/CellLocator.h>
 
 namespace vtkm
@@ -35,7 +37,7 @@ namespace vtkm
 namespace cont
 {
 
-class VTKM_CONT_EXPORT CellLocator : public vtkm::cont::ExecutionObjectBase
+class VTKM_ALWAYS_EXPORT CellLocator : public vtkm::cont::ExecutionObjectBase
 {
 
 public:

vtkm/filter/testing/UnitTestLagrangianFilter.cxx

@@ -19,9 +19,12 @@
 //============================================================================
 
 #include <iostream>
+#include <vtkm/cont/BoundingIntervalHierarchy.h>
+#include <vtkm/cont/BoundingIntervalHierarchy.hxx>
 #include <vtkm/cont/DataSetBuilderUniform.h>
 #include <vtkm/cont/DataSetFieldAdd.h>
 #include <vtkm/cont/testing/Testing.h>
+
 #include <vtkm/filter/Lagrangian.h>
 
 vtkm::cont::DataSet MakeTestUniformDataSet()

vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx

@@ -21,6 +21,7 @@
 #include <vtkm/cont/Algorithm.h>
 #include <vtkm/cont/ArrayHandleConcatenate.h>
 #include <vtkm/cont/BoundingIntervalHierarchy.h>
+#include <vtkm/cont/BoundingIntervalHierarchy.hxx>
 #include <vtkm/cont/DataSetBuilderUniform.h>
 #include <vtkm/cont/Timer.h>
 #include <vtkm/cont/internal/DeviceAdapterTag.h>