mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-08 11:29:02 +00:00
Merge topic 'use_vtkm_aligned_union_intel'
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:
commit
711efbe3b8
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
// It would make sense to put this in its own header file, but it is hard to imagine needing
|
// It would make sense to put this in its own header file, but it is hard to imagine needing
|
||||||
// aligned_union anywhere else.
|
// 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>
|
#include <algorithm>
|
||||||
namespace vtkmstd
|
namespace vtkmstd
|
||||||
|
Loading…
Reference in New Issue
Block a user