From aef44c7970457cc2b673429f8e632e4ac2ee3510 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 4 Sep 2013 23:18:47 -0700 Subject: Don't use an extension to the C++ language in public headers According to Clang 3.3, this is an extension: qpalette.h:178:9: error: anonymous types declared in an anonymous union are an extension [-Werror,-Wnested-anon-types] qsizepolicy.h:148:9: error: anonymous types declared in an anonymous union are an extension [-Werror,-Wnested-anon-types] If you try to simply give the struct a name, it complains with: qpalette.h:178:16: error: types cannot be declared in an anonymous union Change-Id: I61c69b8e42a1f4c4a15a0733f2d7efa0b3e44864 Reviewed-by: Robin Burchell --- src/gui/kernel/qpalette.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gui/kernel/qpalette.h') diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index 2248f6727e..9abca30f12 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -174,11 +174,12 @@ private: void detach(); QPalettePrivate *d; + struct Data { + uint current_group : 4; + uint resolve_mask : 28; + }; union { - struct { - uint current_group : 4; - uint resolve_mask : 28; - } data; + Data data; quint32 for_faster_swapping_dont_use; }; friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPalette &p); -- cgit v1.2.3