Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'use_vtkm_aligned_union_intel'

Browse Source 
8edfd8eba using vtkm aligned union for all intel compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1863
This commit is contained in:
Matt Larsen 2019-09-23 14:36:16 +00:00 committed by Kitware Robot
commit 711efbe3b8
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/Variant.h
View File

@ -17,7 +17,7 @@
// It would make sense to put this in its own header file, but it is hard to imagine needing
// aligned_union anywhere else.
#if (defined(VTKM_GCC) && (__GNUC__ == 4)) || (defined(VTKM_ICC) && (__INTEL_COMPILER < 1800))
#if (defined(VTKM_GCC) && (__GNUC__ == 4)) || defined(VTKM_ICC)
#include <algorithm>
namespace vtkmstd