diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-15 11:01:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-15 11:32:09 +0200 |
| commit | aaa7ab5222dee55cbd8c1bf180f8928888492a6b (patch) | |
| tree | 21b8cbf2b0185e5ce68ee01d43ce8984d42270fb | |
| parent | 588cbca5b77e507de08cd23a63d23edd4f45b22e (diff) | |
Only include <bit> if using post C++17
Otherwise we hit an #error statement in MSVC standard library.
Change-Id: Ib029edf0be8513a80f2640fd9ca75541615a0448
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| -rw-r--r-- | src/corelib/kernel/qmath.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringconverter.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qalgorithms.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index 4c5a980f3a..98251c0b57 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -47,7 +47,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qalgorithms.h> -#if __has_include(<bit>) +#if __has_include(<bit>) && __cplusplus > 201703L #include <bit> #endif diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp index 778674ebd8..4af4a1af9d 100644 --- a/src/corelib/text/qstringconverter.cpp +++ b/src/corelib/text/qstringconverter.cpp @@ -50,7 +50,7 @@ #include <qt_windows.h> #endif -#if __has_include(<bit>) +#if __has_include(<bit>) && __cplusplus > 201703L #include <bit> #endif diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 58709f7fdf..11e4d9da39 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -42,7 +42,7 @@ #include <QtCore/qglobal.h> -#if __has_include(<bit>) +#if __has_include(<bit>) && __cplusplus > 201703L #include <bit> #endif |