Commit 711efbe3 authored by Matt Larsen's avatar Matt Larsen Committed by Kitware Robot

Merge topic 'use_vtkm_aligned_union_intel'

8edfd8eb using vtkm aligned union for all intel compilers
Acked-by: Kitware Robot's avatarKitware Robot <>
Acked-by: Robert Maynard's avatarRobert Maynard <>
Merge-request: !1863
parents 2103d614 8edfd8eb
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment