1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QList: give the LWG 3346 #ifdef'ery a symbolic name

Browse Source 
We'll need this in more places, so centralize its definition in
qcompilerdetection.h.

Amends 595b4e1a9b436a8190964dc41f79621400f5a6be.

Pick-to: 6.6 6.5
Change-Id: I87f84cb9ff3ad339c000604423295180176f5799
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit f4cfc21dec6319c2ae99042be6bb12922a9d336d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-02-08 11:36:57 +01:00 committed by Qt Cherry-pick Bot
parent bd17f3f370
commit bfd565a4d3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qcompilerdetection.h
View File

@ -1399,6 +1399,11 @@ QT_WARNING_DISABLE_MSVC(4530) /* C++ exception handler used, but unwind semantic
# endif # endif
#endif #endif
// libstdc++ shipped with gcc < 11 does not have a fix for defect LWG 3346
#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11)
# define QT_COMPILER_HAS_LWG3346
#endif
#if defined(__cplusplus) && __cplusplus >= 202002L // P0846 doesn't have a feature macro :/ #if defined(__cplusplus) && __cplusplus >= 202002L // P0846 doesn't have a feature macro :/
# define QT_COMPILER_HAS_P0846 # define QT_COMPILER_HAS_P0846
#endif #endif

6
src/corelib/tools/qlist.h
View File

@ -116,8 +116,7 @@ public:
public: public:
using difference_type = qsizetype; using difference_type = qsizetype;
using value_type = T; using value_type = T;
// libstdc++ shipped with gcc < 11 does not have a fix for defect LWG 3346 #ifdef QT_COMPILER_HAS_LWG3346
#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11)
using iterator_concept = std::contiguous_iterator_tag; using iterator_concept = std::contiguous_iterator_tag;
using element_type = value_type; using element_type = value_type;
#endif #endif
@ -187,8 +186,7 @@ public:
public: public:
using difference_type = qsizetype; using difference_type = qsizetype;
using value_type = T; using value_type = T;
// libstdc++ shipped with gcc < 11 does not have a fix for defect LWG 3346 #ifdef QT_COMPILER_HAS_LWG3346
#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11)
using iterator_concept = std::contiguous_iterator_tag; using iterator_concept = std::contiguous_iterator_tag;
using element_type = const value_type; using element_type = const value_type;
#endif #endif

2
tests/auto/corelib/tools/qlist/tst_qlist.cpp
View File

@ -9,7 +9,7 @@
#include <qlist.h> #include <qlist.h>
#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11) #ifdef QT_COMPILER_HAS_LWG3346
# if __has_include(<concepts>) # if __has_include(<concepts>)
# include <concepts> # include <concepts>
# if defined(__cpp_lib_concepts) && __cpp_lib_concepts >= 202002L # if defined(__cpp_lib_concepts) && __cpp_lib_concepts >= 202002L