Merge topic 'correct_transfer_to_opengl_test'

df8c13ee Mark vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug as static

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !369
This commit is contained in:
Robert Maynard 2016-03-18 11:27:10 -04:00 committed by Kitware Robot
commit 81405ecf0e

@ -69,7 +69,7 @@
// never used and seems very crazy.
#include <pthread.h>
#define VTKM_NVIDIA_PTHREAD_WORKAROUND 1
int vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug()
static int vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug()
{ return static_cast<int>(pthread_self()); }
#endif