diff options
Diffstat (limited to 'src/corelib/tools/qpair.h')
-rw-r--r-- | src/corelib/tools/qpair.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index f8455339f3..b73bf6706a 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -66,18 +66,7 @@ struct QPair // mark QPair<T1,T2> as complex/movable/primitive depending on the // typeinfos of the constituents: template<class T1, class T2> -class QTypeInfo< QPair<T1, T2> > -{ -public: - enum { - isComplex = QTypeInfo<T1>::isComplex || QTypeInfo<T2>::isComplex, - isStatic = QTypeInfo<T1>::isStatic || QTypeInfo<T2>::isStatic, - isLarge = sizeof(QPair<T1, T2>) > sizeof(void*), - isPointer = false, - isDummy = false, - sizeOf = sizeof(QPair<T1, T2>) - }; -}; +class QTypeInfo<QPair<T1, T2> > : public QTypeInfoMerger<QPair<T1, T2>, T1, T2> {}; // Q_DECLARE_TYPEINFO template <class T1, class T2> Q_INLINE_TEMPLATE bool operator==(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) |