From c0af004d7472065ccf64e2b05349febac1b4f9de Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Sat, 5 Feb 2022 14:40:53 +0100 Subject: [PATCH] Fix build with C++20 on macOS The macOS standard library doesn't have std::contiguous_iterator yet, and it doesn't seem like libc++ has it either. Checking __cpp_lib_concepts for the C++20 official version appears to work. Pick-to: 6.3 6.2 Change-Id: I8c31cd64de24c03b3a3f37cb393bb2f9b55a834d Reviewed-by: Marc Mutz --- tests/auto/corelib/tools/qlist/tst_qlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp index f40370bfb8c..2b465cca076 100644 --- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp +++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp @@ -37,7 +37,7 @@ #if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11) # if __has_include() # include -# if defined(__cpp_concepts) +# if defined(__cpp_lib_concepts) && __cpp_lib_concepts >= 202002L static_assert(std::contiguous_iterator::iterator>); static_assert(std::contiguous_iterator::const_iterator>); # endif