From b096c53d593a313a6372bffb35f45cdc0e1ffd21 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 4 Jan 2018 14:33:06 +0100 Subject: QtCore: Raise minimum supported MSVC version to 2015 Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: I211703189ff12f827d94914093369736b6e65d4a Reviewed-by: Thiago Macieira --- src/corelib/tools/qbytearraymatcher.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/corelib/tools/qbytearraymatcher.h') diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index c1c0c3a660..dafaea9c12 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -134,9 +134,6 @@ private: } }; -QT_WARNING_PUSH -QT_WARNING_DISABLE_MSVC(4351) // MSVC 2013: "new behavior: elements of array ... will be default initialized" - // remove once we drop MSVC 2013 support template class QStaticByteArrayMatcher : QStaticByteArrayMatcherBase { @@ -158,8 +155,6 @@ public: QByteArray pattern() const { return QByteArray(m_pattern, int(N - 1)); } }; -QT_WARNING_POP - template Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher qMakeStaticByteArrayMatcher(const char (&pattern)[N]) Q_DECL_NOTHROW { return QStaticByteArrayMatcher(pattern); } -- cgit v1.2.3