Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-undef-errors'

Browse Source 
e266dcb34 Merge branch 'upstream-taotuple' into fix-undef-errors
c2bd0a710 taotuple 2019-02-14 (b8ca98d2)
5b71c3467 brigand: fix intel check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1551
This commit is contained in:
Ben Boeckel 2019-02-14 21:35:54 +00:00 committed by Kitware Robot
commit e0c0e4b3da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/internal/brigand.hpp
View File

@ -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__

2
vtkm/thirdparty/taotuple/vtkmtaotuple/include/Tuple.h vendored
View File

@ -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 && \