From 2f98cdf71714c45968fac5e44d461ff6d684a271 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 26 Feb 2016 13:51:28 -0500 Subject: [PATCH] Resolves Issue #56: ChooseCudaDevice functions are in the proper namespace. --- vtkm/cont/cuda/ChooseCudaDevice.h | 2 +- vtkm/opengl/testing/WindowBase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/cont/cuda/ChooseCudaDevice.h b/vtkm/cont/cuda/ChooseCudaDevice.h index 6fd65802e..73dd1c011 100644 --- a/vtkm/cont/cuda/ChooseCudaDevice.h +++ b/vtkm/cont/cuda/ChooseCudaDevice.h @@ -27,8 +27,8 @@ #include namespace vtkm{ -namespace cuda{ namespace cont { +namespace cuda{ namespace { struct compute_info diff --git a/vtkm/opengl/testing/WindowBase.h b/vtkm/opengl/testing/WindowBase.h index 67dc864a4..5b731d7b8 100644 --- a/vtkm/opengl/testing/WindowBase.h +++ b/vtkm/opengl/testing/WindowBase.h @@ -100,7 +100,7 @@ public: } #ifdef VTKM_CUDA - int id = vtkm::cuda::cont::FindFastestDeviceId(); + int id = vtkm::cont::cuda::FindFastestDeviceId(); vtkm::opengl::cuda::SetCudaGLDevice(id); #endif