diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 14:33:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-08 04:52:43 +0000 |
| commit | b096c53d593a313a6372bffb35f45cdc0e1ffd21 (patch) | |
| tree | 31b9eb39439c6fb0055c167b1105489728ae6bbf /src/corelib/tools/qbytearraymatcher.h | |
| parent | 78f234d5dd7face13dd88fd777fa27497590b34d (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qbytearraymatcher.h')
| -rw-r--r-- | src/corelib/tools/qbytearraymatcher.h | 5 |
1 files changed, 0 insertions, 5 deletions
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 <uint N> class QStaticByteArrayMatcher : QStaticByteArrayMatcherBase { @@ -158,8 +155,6 @@ public: QByteArray pattern() const { return QByteArray(m_pattern, int(N - 1)); } }; -QT_WARNING_POP - template <uint N> Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher<N> qMakeStaticByteArrayMatcher(const char (&pattern)[N]) Q_DECL_NOTHROW { return QStaticByteArrayMatcher<N>(pattern); } |