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

Add detection for C++11 explicit conversion operators.

Browse Source 
Change-Id: Ib33049b538f072079c0f840bc10adf0899217199
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marcel Krems 2013-09-08 10:29:46 +02:00 committed by The Qt Project
parent 9deacd7f20
commit 8b124a7dde
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,6 +441,7 @@
* N2346 Q_COMPILER_DEFAULT_MEMBERS * N2346 Q_COMPILER_DEFAULT_MEMBERS
* N2346 Q_COMPILER_DELETE_MEMBERS * N2346 Q_COMPILER_DELETE_MEMBERS
* N1986 Q_COMPILER_DELEGATING_CONSTRUCTORS * N1986 Q_COMPILER_DELEGATING_CONSTRUCTORS
* N2437 Q_COMPILER_EXPLICIT_CONVERSIONS
* N3206 N3272 Q_COMPILER_EXPLICIT_OVERRIDES (v0.9 and above only) * N3206 N3272 Q_COMPILER_EXPLICIT_OVERRIDES (v0.9 and above only)
* N1987 Q_COMPILER_EXTERN_TEMPLATES * N1987 Q_COMPILER_EXTERN_TEMPLATES
* N2540 Q_COMPILER_INHERITING_CONSTRUCTORS * N2540 Q_COMPILER_INHERITING_CONSTRUCTORS
@ -554,6 +555,9 @@
# if __has_feature(cxx_delegating_constructors) # if __has_feature(cxx_delegating_constructors)
# define Q_COMPILER_DELEGATING_CONSTRUCTORS # define Q_COMPILER_DELEGATING_CONSTRUCTORS
# endif # endif
# if __has_feature(cxx_explicit_conversions)
# define Q_COMPILER_EXPLICIT_CONVERSIONS
# endif
# if __has_feature(cxx_override_control) # if __has_feature(cxx_override_control)
# define Q_COMPILER_EXPLICIT_OVERRIDES # define Q_COMPILER_EXPLICIT_OVERRIDES
# endif # endif
@ -639,6 +643,7 @@
# endif # endif
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405
/* C++11 features supported in GCC 4.5: */ /* C++11 features supported in GCC 4.5: */
# define Q_COMPILER_EXPLICIT_CONVERSIONS
# define Q_COMPILER_LAMBDA # define Q_COMPILER_LAMBDA
# define Q_COMPILER_RAW_STRINGS # define Q_COMPILER_RAW_STRINGS
# endif # endif