Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 03:56:10 +08:00
Code Activity

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

Browse Source
This commit is contained in:
Nicholas Hastings
2013-10-06 13:46:15 -04:00
parent 34d4b05185
commit 9889382863
67 changed files with 218 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vgui2/chromehtml/html_chrome.cpp
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
//-----------------------------------------------------------------------------

2
vgui2/vgui_controls/AnimationController.cpp
View File

@ -3,7 +3,9 @@
// Purpose:
//
//=============================================================================//
#ifdef _WIN32
#pragma warning( disable : 4244 ) // conversion from 'double' to 'float', possible loss of data
#endif
#include <vgui/IScheme.h>
#include <vgui/ISurface.h>

4
vgui2/vgui_controls/BuildModeDialog.cpp
View File

@ -115,7 +115,9 @@ class BuildModeLocalizedStringEditDialog : public Frame
public:
#ifdef _WIN32
#pragma warning( disable : 4355 )
#endif
BuildModeLocalizedStringEditDialog() : Frame(this, NULL)
{
m_pTokenEntry = new TextEntry(this, NULL);
@ -133,7 +135,9 @@ public:
m_pFileCombo->AddItem(g_pVGuiLocalize->GetLocalizationFileName(i), NULL);
}
}
#ifdef _WIN32
#pragma warning( default : 4355 )
#endif
virtual void DoModal(const char *token)
{

4
vgui2/vgui_controls/EditablePanel.cpp
View File

@ -49,7 +49,9 @@ DECLARE_BUILD_FACTORY( EditablePanel );
//-----------------------------------------------------------------------------
// Purpose: Constructor
//-----------------------------------------------------------------------------
#ifdef _WIN32
#pragma warning( disable : 4355 )
#endif
EditablePanel::EditablePanel(Panel *parent, const char *panelName) : Panel(parent, panelName), m_NavGroup(this)
{
@ -78,7 +80,9 @@ EditablePanel::EditablePanel(Panel *parent, const char *panelName, HScheme hSche
SetBuildGroup(GetBuildGroup());
}
#ifdef _WIN32
#pragma warning( default : 4355 )
#endif
//-----------------------------------------------------------------------------
// Purpose: Destructor