summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qarraydataops.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
-rw-r--r--src/corelib/tools/qarraydataops.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index 6bb8280ca8..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);
}
@@ -411,18 +411,18 @@ struct QArrayOpsSelector
template <class T>
struct QArrayOpsSelector<T,
- typename QEnableIf<
- !QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic
- >::Type>
+ typename std::enable_if<
+ !QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable
+ >::type>
{
typedef QPodArrayOps<T> Type;
};
template <class T>
struct QArrayOpsSelector<T,
- typename QEnableIf<
- QTypeInfo<T>::isComplex && !QTypeInfo<T>::isStatic
- >::Type>
+ typename std::enable_if<
+ QTypeInfoQuery<T>::isComplex && QTypeInfoQuery<T>::isRelocatable
+ >::type>
{
typedef QMovableArrayOps<T> Type;
};