summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-02-14 10:40:15 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2021-09-21 19:22:33 +0100
commit388e7504be285151dc10a79662eecdbecf1cd1bc (patch)
tree4f5f7ae4e8c2f1ef8b9d2c7124a36be450a6c7c9 /src/corelib/kernel
parent3f9d19b17b5ab6f9943a50d52da3b63932fb5014 (diff)
QVariant::Private: select storage in get at compile time
Change-Id: I82b0a7ec28400dac64ea785ba6766ca488e615aa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qvariant.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index ae39946cc3..d8ef892cb7 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -499,7 +499,7 @@ public:
// determine internal storage at compile time
template<typename T>
const T &get() const
- { return *static_cast<const T *>(storage()); }
+ { return *static_cast<const T *>(CanUseInternalSpace<T> ? &data.data : data.shared->data()); }
template<typename T>
void set(const T &t)
{ *static_cast<T *>(CanUseInternalSpace<T> ? &data.data : data.shared->data()) = t; }