diff options
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 47a19dd75d..ae83e6986e 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -145,7 +145,7 @@ struct QGenericArrayOps T *const begin = this->begin(); do { - new (begin + this->size) T(); + new (begin + this->size) T; } while (uint(++this->size) != newSize); } @@ -412,7 +412,7 @@ struct QArrayOpsSelector template <class T> struct QArrayOpsSelector<T, typename std::enable_if< - !QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic + !QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable >::type> { typedef QPodArrayOps<T> Type; @@ -421,7 +421,7 @@ struct QArrayOpsSelector<T, template <class T> struct QArrayOpsSelector<T, typename std::enable_if< - QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic + QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable >::type> { typedef QMovableArrayOps<T> Type; |