diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-19 14:49:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-20 16:58:49 +0200 |
| commit | 7315296e9c94c38c842728aed199ac286a3ef174 (patch) | |
| tree | 535e8fe234b9487fbbfd12767e09d5e16256de42 /src/corelib/global/qcompilerdetection.h | |
| parent | 31788fc9818c9914d50c1a6a842d3dda16a26172 (diff) | |
Disable C++11 noexcept support in GCC 4.6.0 and 4.6.1
See report: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50309
Change-Id: I5ab3ab1dea42b03ea22dbfbe5f7039c537dabd33
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -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 be167f2a2a..57cba10d6b 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -632,6 +632,11 @@ # define Q_COMPILER_NULLPTR # define Q_COMPILER_UNRESTRICTED_UNIONS # define Q_COMPILER_RANGE_FOR +# if __GNUC__ == 4 && __GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ < 2 + /* GCC 4.6.0 and 4.6.1 have a problem dealing with noexcept expressions, + * so turn the feature off for those versions */ +# undef Q_COMPILER_NOEXCEPT +# endif # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407 /* C++11 features supported in GCC 4.7: */ |