diff options
Diffstat (limited to 'src/corelib/tools/qbytearraymatcher.h')
-rw-r--r-- | src/corelib/tools/qbytearraymatcher.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 51e08ba4bf..476bc3c049 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -132,6 +132,9 @@ 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 { @@ -153,6 +156,8 @@ 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); } |