From 30d0e1770c3d917d5bdae5e8766e401b4f1b4c2b Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 20 Jan 2017 15:58:10 +0300 Subject: Use std::enable_if instead of QEnableIf Change-Id: Ideca8283141484cb6da47c50333f5c96e416f082 Reviewed-by: Edward Welbourne Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/tools/qmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qmap.h') diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 3f4f034b4e..e6da2820f8 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -99,10 +99,10 @@ struct Q_CORE_EXPORT QMapNodeBase void setParent(QMapNodeBase *pp) { p = (p & Mask) | quintptr(pp); } template - static typename QtPrivate::QEnableIf::isComplex>::Type + static typename std::enable_if::isComplex>::type callDestructorIfNecessary(T &t) Q_DECL_NOTHROW { Q_UNUSED(t); t.~T(); } // Q_UNUSED: silence MSVC unused 't' warning template - static typename QtPrivate::QEnableIf::isComplex>::Type + static typename std::enable_if::isComplex>::type callDestructorIfNecessary(T &) Q_DECL_NOTHROW {} }; -- cgit v1.2.3