diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 09:25:42 +0200 |
| commit | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WTF/wtf/Vector.h | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (diff) | |
| download | qtwebkit-5909e6d0d10de3e1370b3ea0bc596f580101e3b4.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.212' into dev"
Diffstat (limited to 'Source/WTF/wtf/Vector.h')
| -rw-r--r-- | Source/WTF/wtf/Vector.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WTF/wtf/Vector.h b/Source/WTF/wtf/Vector.h index 18268b6ef..d9a25ac6f 100644 --- a/Source/WTF/wtf/Vector.h +++ b/Source/WTF/wtf/Vector.h @@ -85,7 +85,7 @@ struct VectorInitializer<true, true, T> { static void initialize(T* begin, T* end) { - memset(begin, 0, reinterpret_cast<char*>(end) - reinterpret_cast<char*>(begin)); + memset(static_cast<void*>(begin), 0, reinterpret_cast<char*>(end) - reinterpret_cast<char*>(begin)); } }; @@ -125,11 +125,11 @@ struct VectorMover<true, T> { static void move(const T* src, const T* srcEnd, T* dst) { - memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); + memcpy(static_cast<void*>(dst), static_cast<void*>(const_cast<T*>(src)), reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); } static void moveOverlapping(const T* src, const T* srcEnd, T* dst) { - memmove(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); + memmove(static_cast<void*>(dst), static_cast<void*>(const_cast<T*>(src)), reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); } }; @@ -155,7 +155,7 @@ struct VectorCopier<true, T> { static void uninitializedCopy(const T* src, const T* srcEnd, T* dst) { - memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); + memcpy(static_cast<void*>(dst), static_cast<void*>(const_cast<T*>(src)), reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src)); } template<typename U> static void uninitializedCopy(const T* src, const T* srcEnd, U* dst) |