mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 00:47:54 +08:00
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
|
||
|
index 3879b48..c380893 100644
|
||
|
--- a/src/corelib/tools/qarraydata.cpp
|
||
|
+++ b/src/corelib/tools/qarraydata.cpp
|
||
|
@@ -149,19 +149,16 @@
|
||
|
|
||
|
// End of qtools_p.h implementation
|
||
|
|
||
|
-QT_WARNING_PUSH
|
||
|
-QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
|
||
|
-
|
||
|
const QArrayData QArrayData::shared_null[2] = {
|
||
|
{ Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared null
|
||
|
- /* zero initialized terminator */};
|
||
|
+ { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */
|
||
|
+};
|
||
|
|
||
|
static const QArrayData qt_array[3] = {
|
||
|
{ Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared empty
|
||
|
{ { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, sizeof(QArrayData) }, // unsharable empty
|
||
|
- /* zero initialized terminator */};
|
||
|
-
|
||
|
-QT_WARNING_POP
|
||
|
+ { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 } /* zero initialized terminator */
|
||
|
+};
|
||
|
|
||
|
static const QArrayData &qt_array_empty = qt_array[0];
|
||
|
static const QArrayData &qt_array_unsharable_empty = qt_array[1];
|