From 46c295b4b1e7071105dfcb57f3fe4b649b02cf8f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 6 Aug 2016 22:43:09 +0300 Subject: [PATCH] Suppress MSVC 2015 warning C4309. --HG-- branch : develop --- src/libs/qmuparser/qmuparsertokenreader.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp index 0bf24a1d7..33b67586a 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.cpp +++ b/src/libs/qmuparser/qmuparsertokenreader.cpp @@ -310,6 +310,8 @@ void QmuParserTokenReader::SetParent ( QmuParserBase *a_pParent ) * @return The Position of the first character not listed in a_szCharSet. * @throw nothrow */ +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4309) int QmuParserTokenReader::ExtractToken ( const QString &a_szCharSet, QString &a_sTok, int a_iPos ) const { const std::wstring m_strFormulaStd = m_strFormula.toStdWString(); @@ -366,6 +368,7 @@ int QmuParserTokenReader::ExtractOperatorToken ( QString &a_sTok, int a_iPos ) c return ExtractToken ( QMUP_CHARS, a_sTok, a_iPos ); } } +QT_WARNING_POP //--------------------------------------------------------------------------------------------------------------------- /**