diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-12 22:27:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:17:05 +0200 |
| commit | 524edc7363ecb2ea2697ab17409705c277664e54 (patch) | |
| tree | 9d9907d517e1867c4df500c9605f1782b3448fff /tests/benchmarks | |
| parent | bfbac6be753c8fa01345d7f9ea2f8bffc170337b (diff) | |
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 <maurice.kalinowski@qt.io>
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |