From 524edc7363ecb2ea2697ab17409705c277664e54 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 12 Jul 2020 22:27:41 +0200 Subject: Clean up QVariant::Private::Data Remove all the internal members of the union. Instead replace it with raw storage (uchar[]) aligned to max_align_t. Place all accesses to the internal members with get<> methods for consistency. Change-Id: Icebf46b90c9375aa6ea0b5913b2132608e8c223d Reviewed-by: Maurice Kalinowski --- tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp') diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp index d3c779b3aa..be77cf5d6c 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp @@ -91,7 +91,7 @@ struct BigClass { double n,i,e,r,o,b; }; -static_assert(sizeof(BigClass) > sizeof(QVariant::Private::Data)); +static_assert(sizeof(BigClass) > sizeof(QVariant::Private::MaxInternalSize)); QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(BigClass, Q_MOVABLE_TYPE); QT_END_NAMESPACE @@ -101,7 +101,7 @@ struct SmallClass { char s; }; -static_assert(sizeof(SmallClass) <= sizeof(QVariant::Private::Data)); +static_assert(sizeof(SmallClass) <= sizeof(QVariant::Private::MaxInternalSize)); QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(SmallClass, Q_MOVABLE_TYPE); QT_END_NAMESPACE -- cgit v1.2.3