Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'correct_namespace_for_ChooseCudaDevice'

Browse Source 
2f98cdf7 Resolves Issue #56: ChooseCudaDevice functions are in the proper namespace.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !347
This commit is contained in:
Robert Maynard 2016-02-26 14:38:17 -05:00 committed by Kitware Robot
commit 7c84e32835
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/cuda/ChooseCudaDevice.h
View File

@ -27,8 +27,8 @@
#include <vector>
namespace vtkm{
namespace cuda{
namespace cont {
namespace cuda{
namespace {
struct compute_info

2
vtkm/opengl/testing/WindowBase.h
View File

@ -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