Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'make_cont_export_macro_be_device_host' into 'master'

Browse Source 
Revert the VTKM_EXEC_EXPORT changes.

Figuring out a better approach.

See merge request !180
This commit is contained in:
Robert Maynard 2015-09-02 23:38:45 -04:00
commit 1906e273d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/internal/ExportMacros.h
View File

@ -27,7 +27,7 @@
*/
#ifdef VTKM_CUDA
#define VTKM_EXEC_EXPORT inline __device__ __host__
#define VTKM_EXEC_EXPORT inline __device__
#define VTKM_EXEC_CONT_EXPORT inline __device__ __host__
#define VTKM_EXEC_CONSTANT_EXPORT __device__ __constant__
#else