diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-11-11 00:18:40 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-24 15:10:00 +0100 |
| commit | 1ba5796d0903afed48f2ca179e75786c1786c707 (patch) | |
| tree | 8ceb0b68ee14b7bcce7f41e864435cadf58117df | |
| parent | ce9d760d59c3cd0c5de0325366f50cd1ec7cc5a0 (diff) | |
Silence warnings about GCC #pragma in ICC
Change-Id: I7659ce312f3777ae68190979681656d12306d33c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| -rw-r--r-- | src/corelib/thread/qatomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 94cef790db..a8e321b46a 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wextra" #endif @@ -157,7 +157,7 @@ public: #endif }; -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL) # pragma GCC diagnostic pop #endif |