diff options
| author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-05-22 09:08:38 (GMT) |
|---|---|---|
| committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-05-22 09:14:05 (GMT) |
| commit | 308a105bf6ae6eb5702440728428a96b5806b085 (patch) | |
| tree | dddce2e1555bc0ca8772c8f61d99c1e56105df96 /src/gui | |
| parent | 5cd9be6c2702ce1f4292003ac3e864f08a0311f3 (diff) | |
| download | Qt-308a105bf6ae6eb5702440728428a96b5806b085.zip Qt-308a105bf6ae6eb5702440728428a96b5806b085.tar.gz Qt-308a105bf6ae6eb5702440728428a96b5806b085.tar.bz2 | |
Revert "Ignore GCC warning of unsafe floating point comparisons."
This reverts commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
There is no way to restore float-equal warning using the pragma trick.
This means (as it was mentioned in the said commit log) anyone that
includes qtransform.h will be forced to deal with float-equal.
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtransform.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 4a33969..c76409b 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -255,13 +255,6 @@ inline qreal QTransform::dy() const return affine._dy; } -#if defined(Q_CC_GNU) -# define Q_CC_GNU_VERSION (((__GNUC__)<<16)|((__GNUC_MINOR__)<<8)|(__GNUC_PATCHLEVEL__)) -# if Q_CC_GNU_VERSION >= 0x040201 -# pragma GCC diagnostic ignored "-Wfloat-equal" -# endif -#endif - inline QTransform &QTransform::operator*=(qreal num) { if (num == 1.) @@ -318,13 +311,6 @@ inline QTransform &QTransform::operator-=(qreal num) return *this; } -#if defined(Q_CC_GNU_VERSION) -# if Q_CC_GNU_VERSION >= 0x040201 -# pragma GCC diagnostic warning "-Wfloat-equal" -# endif -# undef Q_CC_GNU_VERSION -#endif - /****** stream functions *******************/ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTransform &); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTransform &); |