From 053604970ca1969fb55f61d17f07b40ceb2ea4c0 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Tue, 11 Jun 2024 18:15:20 +0200 Subject: [PATCH] QmlDesigner: Fix smallstring compiler warning Change-Id: I237c580f171a4b95aba372d12956cc0d5419bf61 Reviewed-by: Marco Bubke --- src/libs/utils/smallstringlayout.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/smallstringlayout.h b/src/libs/utils/smallstringlayout.h index 6fa1b3d2628..6e33e3010c4 100644 --- a/src/libs/utils/smallstringlayout.h +++ b/src/libs/utils/smallstringlayout.h @@ -264,7 +264,7 @@ struct alignas(16) StringDataLayout(size)} - , capacity_{std::max(capacity, MaximumShortStringDataAreaSize)} + , capacity_{static_cast(std::max(capacity, MaximumShortStringDataAreaSize))} { if (Q_LIKELY(capacity <= shortStringCapacity())) { std::char_traits::copy(buffer, string, size); @@ -286,7 +286,7 @@ struct alignas(16) StringDataLayout(size); } size_type size() const noexcept { return size_; } @@ -302,7 +302,10 @@ struct alignas(16) StringDataLayout(capacity); + } constexpr size_type shortStringSize() const noexcept { return size_; }