diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 20:38:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 20:38:47 +0100 |
| commit | 699a263b29edc26473948d6638232b675409338b (patch) | |
| tree | 0699b08ad6e6055bf3534f69a30e34e4127371a1 /src/corelib/tools/qvector.h | |
| parent | 96ffe48add521e29d883814a35b1130b9dfdd636 (diff) | |
| parent | 5d365b96b9a9d8585a0be5cc1c2376b7b2f27101 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib21e6b9030b4d5363f440d082ce3df28098d1b95
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 9a6e67cc0b..a01d5c8f3c 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -779,7 +779,7 @@ typename QVector<T>::iterator QVector<T>::insert(iterator before, T &&t) } } else { T *b = d->begin() + offset; - memmove(b + 1, b, (d->size - offset) * sizeof(T)); + memmove(static_cast<void *>(b + 1), static_cast<const void *>(b), (d->size - offset) * sizeof(T)); new (b) T(std::move(t)); } d->size += 1; |