Merge branch 'fix-missing-endoffile-newline'

This commit is contained in:
Robert Maynard 2015-06-08 08:24:57 -04:00
commit 441feb151f
8 changed files with 8 additions and 8 deletions

@ -26,4 +26,4 @@ add_subdirectory(internal)
vtkm_declare_headers(${headers})
add_subdirectory(testing)
add_subdirectory(testing)

@ -24,4 +24,4 @@
#include <vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.h>
#include <vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h>
#endif //vtk_m_cont_tbb_DeviceAdapterTBB_h
#endif //vtk_m_cont_tbb_DeviceAdapterTBB_h

@ -74,4 +74,4 @@ public:
} // namespace vtkm::cont::internal
#endif //vtk_m_cont_tbb_internal_ArrayManagerExecutionTBB_h
#endif //vtk_m_cont_tbb_internal_ArrayManagerExecutionTBB_h

@ -25,4 +25,4 @@
VTKM_CREATE_DEVICE_ADAPTER(TBB);
#endif //vtk_m_cont_tbb_internal_DeviceAdapterTagTBB_h
#endif //vtk_m_cont_tbb_internal_DeviceAdapterTagTBB_h

@ -22,4 +22,4 @@ set(unit_tests
UnitTestDeviceAdapterTBB.cxx
UnitTestTBBArrayHandleFancy.cxx
)
vtkm_unit_tests(TBB SOURCES ${unit_tests})
vtkm_unit_tests(TBB SOURCES ${unit_tests})

@ -28,4 +28,4 @@ int UnitTestDeviceAdapterTBB(int, char *[])
{
return vtkm::cont::testing::TestingDeviceAdapter
<vtkm::cont::DeviceAdapterTagTBB>::Run();
}
}

@ -27,4 +27,4 @@ int UnitTestTBBArrayHandleFancy(int, char *[])
{
return vtkm::cont::testing::TestingFancyArrayHandles
<vtkm::cont::DeviceAdapterTagTBB>::Run();
}
}

@ -34,4 +34,4 @@
#include <vtkm/internal/Configure.h>
#endif
#endif