Commit e0c0e4b3 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'fix-undef-errors'

e266dcb3 Merge branch 'upstream-taotuple' into fix-undef-errors
c2bd0a71 taotuple 2019-02-14 (b8ca98d2)
5b71c346 brigand: fix intel check
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1551
parents bdcb76ca e266dcb3
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#if _MSC_VER == 1900 #if _MSC_VER == 1900
#define BRIGAND_COMP_MSVC_2015 #define BRIGAND_COMP_MSVC_2015
#endif #endif
#elif __INTEL_COMPILER #elif defined(__INTEL_COMPILER) || defined(__ICC)
#define BRIGAND_COMP_INTEL #define BRIGAND_COMP_INTEL
#elif __GNUC__ #elif __GNUC__
#ifndef __clang__ #ifndef __clang__
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
// tao::tuple is a much more efficient tuple implementation, but it doesn't // tao::tuple is a much more efficient tuple implementation, but it doesn't
// work on MSVC2015. For this compiler, fallback to a simpler implementation. // 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 #define TAOCPP_USE_SIMPLE_TUPLE
// There is a bug in apple clang 9.0 that prevents tao-tuple from compiling: // 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 && \ #elif defined(__apple_build_version__) && defined(__clang__) && __clang_major__ == 9 && \
......
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