diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-23 10:04:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-23 11:28:24 +0000 |
| commit | 3fcedcbabbd488e9b20e84e56877f6ba2f7aea73 (patch) | |
| tree | d9bdaf990236793cf8fb71b64386dbdf75ffe021 /src/corelib/serialization/qxmlstream_p.h | |
| parent | 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 (diff) | |
Reapply 403343039d07812c0beee9260b291f86e14d8ac4 on 5.11
This change amends 305dd1b61f657474d751cc3b24f58249ec21b61b, which lost
40334303 and brought src/corelib/xml/qxmlstream_p.h back. In
a6b697ca13945a174cff9f3e9b1af1cf61c0bea5, it was moved to
src/corelib/serialization/qxmlstream_p.h in 5.11.
Change-Id: Ia1e9841b866ff49f7274b1b13fd224c0a20a017e
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/serialization/qxmlstream_p.h')
| -rw-r--r-- | src/corelib/serialization/qxmlstream_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index 5645d812eb..4157fbbd0e 100644 --- a/src/corelib/serialization/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h @@ -651,7 +651,8 @@ public: inline void reserve(int extraCapacity) { if (tos + extraCapacity + 1 > cap) { cap = qMax(tos + extraCapacity + 1, cap << 1 ); - data = reinterpret_cast<T *>(realloc(data, cap * sizeof(T))); + void *ptr = realloc(static_cast<void *>(data), cap * sizeof(T)); + data = reinterpret_cast<T *>(ptr); Q_CHECK_PTR(data); } } |