Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/GSL.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJordan Maples <jomaples@microsoft.com>2020-04-09 21:51:59 +0300
committerJordan Maples <jomaples@microsoft.com>2020-04-09 21:51:59 +0300
commit809aee231519d939c151fc355ded2b4e1b1085c2 (patch)
tree77f082cb6007c1db0491a2af246866bfaac9e175 /tests
parent6ef56d73daae558bde2f02a436474c26b35587d7 (diff)
testing different major/minor for Apple suppression
Diffstat (limited to 'tests')
-rw-r--r--tests/span_compatibility_tests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/span_compatibility_tests.cpp b/tests/span_compatibility_tests.cpp
index e32a507..4012839 100644
--- a/tests/span_compatibility_tests.cpp
+++ b/tests/span_compatibility_tests.cpp
@@ -45,10 +45,10 @@ static_assert(!std::is_convertible<Derived (*)[], Base (*)[]>::value,
// int*(*) [], int const* const(*)[] was identified as an issue in CWG330 and the resolution was provided with N4261
// The changes were not backported to all versions of the compilers that GSL supports.
// The `if constexpr` should prevent codegen from happening if it is not supported however a few compilers continue to complain about the logic within.
-// Filtering g++ version < 8, clang version < 7, and Apple clang versions 9.4 and 10.1.
+// Filtering g++ version < 8, clang version < 7, and XCode 9.4 and 10.1 which looks to be Apple clang versions 9.1 and 10.0.
#if (defined(_MSC_VER)) || \
(defined(__GNUC__) && __GNUC__ > 7) || \
-(defined(__APPLE__) && defined(__clang__) && (!(__clang_major__ == 9 && __clang_minor__ == 4) && !(__clang_major__ == 10 && __clang_minor__ == 1))) || \
+(defined(__APPLE__) && defined(__clang__) && (!(__clang_major__ == 9 && __clang_minor__ == 1) && !(__clang_major__ == 10 && __clang_minor__ == 0))) || \
(defined(__clang__) && __clang_major__ > 6)
template <class = void>
void ArrayConvertibilityCheck()