Commit c68919fc authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'msvc2019_intseq_fix'

56b4fa9a MSVC 2019 needs a different integer sequence impl, too.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1887
parents eb97223e 56b4fa9a
......@@ -26,8 +26,8 @@
#include <type_traits>
#include <utility>
// MSVC < 2019 and CUDA and Xcode < 10 and Clang < 5 have issues with tao integer sequences
#if (defined(VTKM_MSVC) && (_MSC_VER < 1920)) || defined(VTKM_CUDA_DEVICE_PASS) || \
// MSVC and CUDA and Xcode < 10 and Clang < 5 have issues with tao integer sequences
#if defined(VTKM_MSVC) || defined(VTKM_CUDA_DEVICE_PASS) || \
(defined(__apple_build_version__) && (__apple_build_version__ < 10000000)) || \
(defined(VTKM_CLANG) && (__clang_major__ < 5))
#define VTKM_USE_BRIGAND_SEQ
......
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