Merge topic 'fix-scope-resolution-for-pthread'

570e41e8 Fix scope resolution for nvidia pthread workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !371
This commit is contained in:
Chuck Atkins 2016-03-18 13:11:23 -04:00 committed by Kitware Robot
commit 5f72eb9252

@ -89,7 +89,7 @@ class TestingWindow : public vtkm::opengl::testing::WindowBase<TestingWindow>
#if defined(VTKM_NVIDIA_PTHREAD_WORKAROUND)
VTKM_CONT_EXPORT int vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug()
{ return vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug(); }
{ return ::vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug(); }
#endif
public: