Commit 59ec3f88 authored by Kenneth Moreland's avatar Kenneth Moreland Committed by Kitware Robot

Merge topic 'icc-in-gcc-mode'

3dd66e85 Do not use __assume for icc in gcc compatability mode
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1139
parents 84a772c3 3dd66e85
......@@ -53,9 +53,10 @@
#if defined(VTKM_MSVC)
#define VTKM_ASSUME_IMPL(cond) __assume(cond)
#elif defined(VTKM_ICC)
#elif defined(VTKM_ICC) && !defined(__GNUC__)
#define VTKM_ASSUME_IMPL(cond) __assume(cond)
#elif defined(VTKM_GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
#elif (defined(VTKM_GCC) || defined(VTKM_ICC)) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
// Added in 4.5.0:
#define VTKM_ASSUME_IMPL(cond) \
if (!(cond)) \
......
......@@ -76,9 +76,10 @@
#if defined(VTKM_MSVC)
#define VTKM_UNREACHABLE_IMPL() __assume(false)
#elif defined(VTKM_ICC)
#elif defined(VTKM_ICC) && !defined(__GNUC__)
#define VTKM_UNREACHABLE_IMPL() __assume(false)
#elif defined(VTKM_GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
#elif (defined(VTKM_GCC) || defined(VTKM_ICC)) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
// Added in 4.5.0:
#define VTKM_UNREACHABLE_IMPL() __builtin_unreachable()
#elif defined(VTKM_CLANG)
......
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