From b3146d2bb830ebbd34e59ea50aba4c69bb12cb90 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 29 Jun 2020 14:37:55 +0300 Subject: Use std::memmove ... and add include for it. Amends ffb73175e6c5b35e6367c88479cc0bf160482016 Change-Id: I709a5aed13f6f62017b9e4116a03a4dfaae4bb13 Reviewed-by: Giuseppe D'Angelo --- src/corelib/tools/qcontainertools_impl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h index b43c3bb1c4..44cfdc444e 100644 --- a/src/corelib/tools/qcontainertools_impl.h +++ b/src/corelib/tools/qcontainertools_impl.h @@ -49,6 +49,7 @@ #include #include +#include #include #include @@ -62,9 +63,9 @@ void q_uninitialized_relocate_n(T* first, N n, T* out) { if constexpr (QTypeInfoQuery::isRelocatable) { if (n != N(0)) { // even if N == 0, out == nullptr or first == nullptr are UB for memmove() - memmove(static_cast(out), - static_cast(first), - n * sizeof(T)); + std::memmove(static_cast(out), + static_cast(first), + n * sizeof(T)); } } else { std::uninitialized_move_n(first, n, out); -- cgit v1.2.3