diff --git a/vtkm/internal/brigand.hpp b/vtkm/internal/brigand.hpp index c44aeffc1..23c8ff77a 100644 --- a/vtkm/internal/brigand.hpp +++ b/vtkm/internal/brigand.hpp @@ -15,7 +15,7 @@ #if _MSC_VER == 1900 #define BRIGAND_COMP_MSVC_2015 #endif -#elif __INTEL_COMPILER +#elif defined(__INTEL_COMPILER) || defined(__ICC) #define BRIGAND_COMP_INTEL #elif __GNUC__ #ifndef __clang__ diff --git a/vtkm/thirdparty/taotuple/vtkmtaotuple/include/Tuple.h b/vtkm/thirdparty/taotuple/vtkmtaotuple/include/Tuple.h index 6c422491f..34df430f3 100644 --- a/vtkm/thirdparty/taotuple/vtkmtaotuple/include/Tuple.h +++ b/vtkm/thirdparty/taotuple/vtkmtaotuple/include/Tuple.h @@ -22,7 +22,7 @@ // tao::tuple is a much more efficient tuple implementation, but it doesn't // work on MSVC2015. For this compiler, fallback to a simpler implementation. -#if _MSC_VER == 1900 +#if defined(_MSC_VER) && _MSC_VER == 1900 #define TAOCPP_USE_SIMPLE_TUPLE // There is a bug in apple clang 9.0 that prevents tao-tuple from compiling: #elif defined(__apple_build_version__) && defined(__clang__) && __clang_major__ == 9 && \