diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-28 11:47:35 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-28 14:27:45 (GMT) |
| commit | 5b4b6b2be7b901ef9a29c37431998034730fa3d3 (patch) | |
| tree | 9dd31b2f0af3f23462575c02f17eb33bdf9bb7e0 /src/corelib/tools/qmap.cpp | |
| parent | e83bb2fdfc2dc899526c8157fd8b77a68cdde9da (diff) | |
| download | Qt-5b4b6b2be7b901ef9a29c37431998034730fa3d3.zip Qt-5b4b6b2be7b901ef9a29c37431998034730fa3d3.tar.gz Qt-5b4b6b2be7b901ef9a29c37431998034730fa3d3.tar.bz2 | |
Initialise the reserved bits to 0.
This is future compatibility: we must rely on them being 0 in older
versions of Qt.
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index cfb18b4..3b48c3f 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QMapData QMapData::shared_null = { &shared_null, { &shared_null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true, false + Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true, false, 0 }; QMapData *QMapData::createData() @@ -75,6 +75,7 @@ QMapData *QMapData::createData(int alignment) d->insertInOrder = false; d->sharable = true; d->strictAlignment = alignment > 8; + d->reserved = 0; return d; } |