diff options
author | Marcel Krems <m.krems@software-vision.eu> | 2013-09-08 10:29:46 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 23:04:48 +0200 |
commit | 8b124a7ddefbacea60d2e5d44e39eed4aa83bec5 (patch) | |
tree | 824a3487807fa452ee7abe7fe9ab75f52aabeda1 /src | |
parent | 9deacd7f2080cc042430df0fe615ed84ee493390 (diff) |
Add detection for C++11 explicit conversion operators.
Change-Id: Ib33049b538f072079c0f840bc10adf0899217199
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qcompilerdetection.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 5b6639d56b..dbedfe5ddd 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -441,6 +441,7 @@ * N2346 Q_COMPILER_DEFAULT_MEMBERS * N2346 Q_COMPILER_DELETE_MEMBERS * N1986 Q_COMPILER_DELEGATING_CONSTRUCTORS + * N2437 Q_COMPILER_EXPLICIT_CONVERSIONS * N3206 N3272 Q_COMPILER_EXPLICIT_OVERRIDES (v0.9 and above only) * N1987 Q_COMPILER_EXTERN_TEMPLATES * N2540 Q_COMPILER_INHERITING_CONSTRUCTORS @@ -554,6 +555,9 @@ # if __has_feature(cxx_delegating_constructors) # define Q_COMPILER_DELEGATING_CONSTRUCTORS # endif +# if __has_feature(cxx_explicit_conversions) +# define Q_COMPILER_EXPLICIT_CONVERSIONS +# endif # if __has_feature(cxx_override_control) # define Q_COMPILER_EXPLICIT_OVERRIDES # endif @@ -639,6 +643,7 @@ # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 /* C++11 features supported in GCC 4.5: */ +# define Q_COMPILER_EXPLICIT_CONVERSIONS # define Q_COMPILER_LAMBDA # define Q_COMPILER_RAW_STRINGS # endif |