diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-06 15:27:48 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2009-11-06 15:28:54 (GMT) |
| commit | 7359baee83f6691c31a0a14ffd6f6cc147ed71fd (patch) | |
| tree | 8047112b605dd5791414a06b2262929972b4a6d8 | |
| parent | d57933fe2c74907c6256aef82374fefd55adee05 (diff) | |
| download | Qt-7359baee83f6691c31a0a14ffd6f6cc147ed71fd.zip Qt-7359baee83f6691c31a0a14ffd6f6cc147ed71fd.tar.gz Qt-7359baee83f6691c31a0a14ffd6f6cc147ed71fd.tar.bz2 | |
use pragma push/pop
prevents leaking the pragma out of the header file
Task-number: QT-2267
| -rw-r--r-- | src/corelib/tools/qbytearraymatcher.h | 8 | ||||
| -rw-r--r-- | src/corelib/tools/qstringmatcher.h | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index ef46d34..3d951cf 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -79,17 +79,21 @@ private: QByteArray q_pattern; #ifdef Q_CC_RVCT // explicitely allow anonymous unions for RVCT to prevent compiler warnings -#pragma anon_unions +# pragma push +# pragma anon_unions #endif struct Data { uchar q_skiptable[256]; const uchar *p; int l; - }; + }; union { uint dummy[256]; Data p; }; +#ifdef Q_CC_RVCT +# pragma pop +#endif }; QT_END_NAMESPACE diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 0cb1312..8076098 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -79,7 +79,8 @@ private: Qt::CaseSensitivity q_cs; #ifdef Q_CC_RVCT // explicitely allow anonymous unions for RVCT to prevent compiler warnings -#pragma anon_unions +# pragma push +# pragma anon_unions #endif struct Data { uchar q_skiptable[256]; @@ -90,6 +91,9 @@ private: uint q_data[256]; Data p; }; +#ifdef Q_CC_RVCT +# pragma pop +#endif }; QT_END_NAMESPACE |