AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compiler detection: add support for C++17's [[deprecated]] on enumerators

Browse Source 
Change-Id: I5cff94d036bd311aee2b6418dd793fde89de0938
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2018-06-19 22:51:05 +02:00
parent 5417949fe2
commit 2a1d0c2669
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1152,6 +1152,11 @@
# define Q_REQUIRED_RESULT [[nodiscard]] # define Q_REQUIRED_RESULT [[nodiscard]]
#endif #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
/* /*
* Fallback macros to certain compiler features * Fallback macros to certain compiler features
*/ */
@ -1186,6 +1191,12 @@
#ifndef Q_DECL_DEPRECATED_X #ifndef Q_DECL_DEPRECATED_X
# define Q_DECL_DEPRECATED_X(text) Q_DECL_DEPRECATED # define Q_DECL_DEPRECATED_X(text) Q_DECL_DEPRECATED
#endif #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 #ifndef Q_DECL_EXPORT
# define Q_DECL_EXPORT # define Q_DECL_EXPORT
#endif #endif