summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-24 11:18:34 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-27 14:09:06 (GMT)
commite2d4cd1536345fc51b509affba45041f2cf1752f (patch)
tree7fecce14eaa0275d8abd129c641e257d06c2e42b /src
parent6c1bc11a0a45f1ea04e271526997ea5002bf5f86 (diff)
downloadQt-e2d4cd1536345fc51b509affba45041f2cf1752f.zip
Qt-e2d4cd1536345fc51b509affba45041f2cf1752f.tar.gz
Qt-e2d4cd1536345fc51b509affba45041f2cf1752f.tar.bz2
Fix warning with Sun CC 5.9 and xlC 7: no new types inside anonymous unions.
See ba191b0a26b966ad1fb596a905307399922bc44a for a similar commit done to QStringMatcher. Reviewed-By: Bradley T. Hughes
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qbytearraymatcher.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index 697b6ff..4bad24c 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -81,13 +81,14 @@ private:
// explicitely allow anonymous unions for RVCT to prevent compiler warnings
#pragma anon_unions
#endif
+ struct Data {
+ uchar q_skiptable[256];
+ const uchar *p;
+ int l;
+ };
union {
uint dummy[256];
- struct {
- uchar q_skiptable[256];
- const uchar *p;
- int l;
- } p;
+ Data p;
};
};