Allow compilation on gcc/clang without -Wno-unknown-pragmas.

This commit is contained in:
Nicholas Hastings committed 2013-10-06 13:46:15 -04:00
1 parent 34d4b05185
commit 9889382863
67 files changed
+218 -17

No files matched your search

+4
View File
@@ -1713,8 +1713,10 @@ const byte *CChromePainter::PPopupTextureDataCached()
//-----------------------------------------------------------------------------
// Purpose: Client implementation of the browser handler class
//-----------------------------------------------------------------------------
#ifdef _WIN32
#pragma warning( push )
#pragma warning( disable : 4355 ) // 'this' : used in base member initializer list
#endif
CClientHandler::CClientHandler( int iBrowser, const char *pchUserAgent, uint16 nSerial ) : m_Painter( this )
{
m_nSerial = nSerial;
@@ -1737,7 +1739,9 @@ CClientHandler::CClientHandler( int iBrowser, const char *pchUserAgent, uint16 n
memset( &m_CachedHScroll, 0, sizeof( m_CachedHScroll ) );
memset( &m_CachedVScroll, 0, sizeof( m_CachedVScroll ) );
}
#ifdef _WIN32
#pragma warning( pop )
#endif
//-----------------------------------------------------------------------------