Commit e266dcb3 authored by Ben Boeckel's avatar Ben Boeckel

Merge branch 'upstream-taotuple' into fix-undef-errors

* upstream-taotuple:
  taotuple 2019-02-14 (b8ca98d2)
parents 5b71c346 c2bd0a71
......@@ -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 && \
......
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