diff options
Diffstat (limited to 'src/qml/memory')
-rw-r--r-- | src/qml/memory/qv4heap_p.h | 6 | ||||
-rw-r--r-- | src/qml/memory/qv4mm_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index 5fb14332ab..6556fcd2e4 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -89,7 +89,7 @@ private: Base *ptr; }; typedef Pointer<char *, 0> V4PointerCheck; -Q_STATIC_ASSERT(std::is_trivial< V4PointerCheck >::value); +Q_STATIC_ASSERT(std::is_trivial_v<V4PointerCheck>); struct Q_QML_EXPORT Base { void *operator new(size_t) = delete; @@ -168,7 +168,7 @@ struct Q_QML_EXPORT Base { Q_ALWAYS_INLINE void _setDestroyed() {} #endif }; -Q_STATIC_ASSERT(std::is_trivial< Base >::value); +Q_STATIC_ASSERT(std::is_trivial_v<Base>); // This class needs to consist only of pointer sized members to allow // for a size/offset translation when cross-compiling between 32- and // 64-bit. @@ -253,7 +253,7 @@ private: QtSharedPointer::ExternalRefCountData *d; QObject *qObject; }; -Q_STATIC_ASSERT(std::is_trivial< QV4QPointer<QObject> >::value); +Q_STATIC_ASSERT(std::is_trivial_v<QV4QPointer<QObject>>); #endif } diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h index 881f4fd19d..f87c6e4075 100644 --- a/src/qml/memory/qv4mm_p.h +++ b/src/qml/memory/qv4mm_p.h @@ -162,7 +162,7 @@ public: template<typename ManagedType> inline typename ManagedType::Data *allocManaged(std::size_t size, Heap::InternalClass *ic) { - Q_STATIC_ASSERT(std::is_trivial< typename ManagedType::Data >::value); + Q_STATIC_ASSERT(std::is_trivial_v<typename ManagedType::Data>); size = align(size); typename ManagedType::Data *d = static_cast<typename ManagedType::Data *>(allocData(size)); d->internalClass.set(engine, ic); |