From 7315296e9c94c38c842728aed199ac286a3ef174 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Aug 2012 14:49:54 +0200 Subject: 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 Reviewed-by: Marc Mutz --- src/corelib/global/qcompilerdetection.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/corelib/global/qcompilerdetection.h') 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: */ -- cgit v1.2.3