Commit 6f482cd3 authored by Maurice Kalinowski's avatar Maurice Kalinowski
Browse files

WinRT: Fix compiler crash (msvc2013 arm)


Visual Studio 2013 Update 3 ARM compiler has issues with the code path
trying to optimize it. Instead of disabling optimization in general,
use a pragma for the function. x86 compilation is fine though.

Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91
Reviewed-by: default avatarAndrew Knight <andrew.knight@digia.com>
Showing with 11 additions and 0 deletions
......@@ -312,6 +312,13 @@ bool QWebSocketFrame::isValid() const
return m_isValid;
}
// The arm compiler of Visual Studio 2013 Update 3 crashes when
// trying to optimize QWebSocketFrame::readFrame. Hence turn
// those off for this snippet
#if defined(Q_OS_WINPHONE) && defined(__ARM__)
# pragma optimize("", off)
#endif
#define WAIT_FOR_MORE_DATA(dataSizeInBytes) \
{ returnState = processingState; \
processingState = PS_WAIT_FOR_MORE_DATA; dataWaitSize = dataSizeInBytes; }
......@@ -520,6 +527,10 @@ QWebSocketFrame QWebSocketFrame::readFrame(QIODevice *pIoDevice)
return frame;
}
#if defined(Q_OS_WINPHONE) && defined(__ARM__)
# pragma optimize("", on)
#endif
/*!
\internal
*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment