diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-30 14:12:02 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-10-02 17:54:39 +0200 |
| commit | 9a3f4afb700bb4fb6c4d26120de71fb61ffab032 (patch) | |
| tree | 5d9942baad0301712beb1f462eee6c7c6ca8432f /src/corelib/global | |
| parent | a1e7c441de16cb4e8d6bdac39160759116ecd233 (diff) | |
Remove checks for features available in C++17
This patch removes most of the checks that are made using C++20
__cpp_* macros for features available in C++17 and earlier.
Library feature check macros (__cpp_lib_*) are unaffected.
Change-Id: I557b2bd0d4ff09b13837555e9880eb28e0355f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 273575c31f..bfa4f89105 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1114,10 +1114,8 @@ # define Q_DECL_DEPRECATED_X(x) [[deprecated(x)]] #endif -#if defined(__cpp_enumerator_attributes) && __cpp_enumerator_attributes >= 201411 -# define Q_DECL_ENUMERATOR_DEPRECATED Q_DECL_DEPRECATED -# define Q_DECL_ENUMERATOR_DEPRECATED_X(x) Q_DECL_DEPRECATED_X(x) -#endif +#define Q_DECL_ENUMERATOR_DEPRECATED Q_DECL_DEPRECATED +#define Q_DECL_ENUMERATOR_DEPRECATED_X(x) Q_DECL_DEPRECATED_X(x) /* * Fallback macros to certain compiler features @@ -1153,12 +1151,6 @@ #ifndef Q_DECL_DEPRECATED_X # define Q_DECL_DEPRECATED_X(text) Q_DECL_DEPRECATED #endif -#ifndef Q_DECL_ENUMERATOR_DEPRECATED -# define Q_DECL_ENUMERATOR_DEPRECATED -#endif -#ifndef Q_DECL_ENUMERATOR_DEPRECATED_X -# define Q_DECL_ENUMERATOR_DEPRECATED_X(x) -#endif #ifndef Q_DECL_EXPORT # define Q_DECL_EXPORT #endif |