Core: Silence gcc warnings about unitinialized members in qarraydata.cpp
It's perfectly correct to leave members uninitialised, since they are zero initialized. Change-Id: I0d0c737cf35793a2633d44ce194af7f489903c03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>bb10
parent
7ec788705f
commit
694e1b6381
|
|
@ -46,6 +46,11 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#if defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
#endif
|
||||
|
||||
const QArrayData QArrayData::shared_null[2] = {
|
||||
{ Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared null
|
||||
/* zero initialized terminator */};
|
||||
|
|
@ -55,6 +60,10 @@ static const QArrayData qt_array[3] = {
|
|||
{ { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, sizeof(QArrayData) }, // unsharable empty
|
||||
/* zero initialized terminator */};
|
||||
|
||||
#if defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
static const QArrayData &qt_array_empty = qt_array[0];
|
||||
static const QArrayData &qt_array_unsharable_empty = qt_array[1];
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue