1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00

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

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

View File

@ -20,7 +20,9 @@ public:
EXPOSE_INTERFACE( CAnimatedTextureProxy, IMaterialProxy, "AnimatedTexture" IMATERIAL_PROXY_INTERFACE_VERSION );
#ifdef _WIN32
#pragma warning (disable : 4100)
#endif
float CAnimatedTextureProxy::GetAnimationStartTime( void* pBaseEntity )
{

View File

@ -13,7 +13,9 @@
class IMaterial;
class IMaterialVar;
#ifdef _WIN32
#pragma warning (disable : 4100)
#endif
class CBaseAnimatedTextureProxy : public IMaterialProxy
{

View File

@ -8,7 +8,9 @@
#include "cbase.h"
// identifier was truncated to '255' characters in the debug information
#ifdef _WIN32
#pragma warning(disable: 4786)
#endif
#include "proxyentity.h"
#include "materialsystem/imaterialvar.h"
@ -113,8 +115,9 @@ void CCamoTextureRegen::RegenerateTextureBits( ITexture *pTexture, IVTFTexture *
m_pProxy->GenerateCamoTexture( pTexture, pVTFTexture );
}
#ifdef _WIN32
#pragma warning (disable:4355)
#endif
CCamoMaterialProxy::CCamoMaterialProxy() : m_TextureRegen(this)
{
@ -136,7 +139,9 @@ CCamoMaterialProxy::CCamoMaterialProxy() : m_TextureRegen(this)
m_pEnt = NULL;
}
#ifdef _WIN32
#pragma warning (default:4355)
#endif
CCamoMaterialProxy::~CCamoMaterialProxy()
{

View File

@ -247,13 +247,17 @@ protected:
static CUtlMap<CDetailModel *, LightStyleInfo_t> gm_LightStylesMap;
#ifdef _WIN32
#pragma warning( disable : 4201 ) //warning C4201: nonstandard extension used : nameless struct/union
#endif
union
{
model_t* m_pModel;
SptrintInfo_t m_SpriteInfo;
};
#ifdef _WIN32
#pragma warning( default : 4201 )
#endif
#ifdef USE_DETAIL_SHAPES
// pointer to advanced properties

View File

@ -17,7 +17,9 @@
#include "PortalRender.h"
#endif
#ifdef _WIN32
#pragma warning( disable: 4355 ) // warning C4355: 'this' : used in base member initializer list
#endif
class CClientTools;

View File

@ -11,7 +11,9 @@
// $NoKeywords: $
//=============================================================================//
#ifdef _WIN32
#pragma warning( disable : 4800 ) // disable forcing int to bool performance warning
#endif
#include "cbase.h"
#include <cdll_client_int.h>

View File

@ -10,8 +10,10 @@
// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
#ifdef _WIN32
// warning C4660: template-class specialization 'CInterpolatedVar<float>' is already instantiated
#pragma warning( disable : 4660 )
#endif
template class CInterpolatedVar<float>;
template class CInterpolatedVar<Vector>;

View File

@ -13,7 +13,9 @@
#include "cbase.h"
#ifdef _WIN32
#pragma warning( disable : 4800 ) // disable forcing int to bool performance warning
#endif
// VGUI panel includes
#include <vgui_controls/Panel.h>

View File

@ -13,7 +13,9 @@
class IMaterial;
class IMaterialVar;
#ifdef _WIN32
#pragma warning (disable : 4100)
#endif
class CBaseToggleTextureProxy : public IMaterialProxy
{

View File

@ -6,7 +6,10 @@
// $NoKeywords: $
//=============================================================================//
#include "cbase.h"
#ifdef _WIN32
#pragma warning (disable: 4514)
#endif
#include "vgui_bitmapimage.h"
#include "vgui_bitmapbutton.h"

View File

@ -6,7 +6,11 @@
// $NoKeywords: $
//=============================================================================//
#include "cbase.h"
#ifdef _WIN32
#pragma warning (disable: 4514)
#endif
#include "vgui_bitmappanel.h"
#include <KeyValues.h>
#include "panelmetaclassmgr.h"

View File

@ -15,11 +15,15 @@
#include "networkvar.h"
#ifdef DEBUG
#ifdef _WIN32
#pragma warning(push)
#endif // _WIN32
#include <typeinfo>
#ifdef _WIN32
#pragma warning(pop)
#pragma warning(disable:4290)
#endif
#endif // _WIN32
#endif // DEBUG
#if defined( _WIN32 )
#pragma once

View File

@ -34,8 +34,10 @@ void DebugNoteMovementFailure()
}
// a place to put breakpoints
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable:4189)
#endif
AIMoveResult_t DbgResult( AIMoveResult_t result )
{
if ( result < AIMR_OK )

View File

@ -433,8 +433,10 @@ int __cdecl AdvisorStagingComparator(const EHANDLE *pe1, const EHANDLE *pe2)
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4706)
#endif
void CNPC_Advisor::Activate()
{
@ -468,7 +470,9 @@ void CNPC_Advisor::Activate()
AssertMsg(m_hvStagingPositions.Count() > 0, "You did not specify any staging positions in the advisor's staging_ent_names !");
#endif
}
#ifdef _WIN32
#pragma warning(pop)
#endif
//-----------------------------------------------------------------------------

View File

@ -94,7 +94,9 @@ const char *g_ppszRandomCombineModels[] =
#define HL2MPPLAYER_PHYSDAMAGE_SCALE 4.0f
#ifdef _WIN32
#pragma warning( disable : 4355 )
#endif
CHL2MP_Player::CHL2MP_Player() : m_PlayerAnimState( this )
{

View File

@ -18,10 +18,14 @@
#ifndef _XBOX
#undef min
#undef max
#ifdef _WIN32
#pragma warning(push)
#endif // _WIN32
#include <set>
#ifdef _WIN32
#pragma warning(pop)
#endif
#endif // _WIN32
#endif // _XBOX
#ifdef _WIN32
#pragma once

View File

@ -71,12 +71,16 @@ LINK_ENTITY_TO_CLASS( prop_vehicle, CPropVehicle );
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
#ifdef _WIN32
#pragma warning (disable:4355)
#endif
CPropVehicle::CPropVehicle() : m_VehiclePhysics( this )
{
SetVehicleType( VEHICLE_TYPE_CAR_WHEELS );
}
#ifdef _WIN32
#pragma warning (default:4355)
#endif
//-----------------------------------------------------------------------------
// Purpose:

View File

@ -25,7 +25,10 @@
// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
#ifdef _WIN32
#pragma warning( disable : 4244 )
#endif
#define iabs(i) (( (i) >= 0 ) ? (i) : -(i) )
int ExtractBbox( CStudioHdr *pstudiohdr, int sequence, Vector& mins, Vector& maxs )

View File

@ -29,7 +29,9 @@
// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
#ifdef _WIN32
#pragma warning( disable : 4127 )
#endif
// Let scene linger for 1/4 second so blends can finish
#define SCENE_LINGER_TIME 0.25f

View File

@ -4837,7 +4837,9 @@ void CGameMovement::FullTossMove( void )
// Purpose: TF2 commander mode movement logic
//-----------------------------------------------------------------------------
#ifdef _WIN32
#pragma warning (disable : 4701)
#endif
void CGameMovement::IsometricMove( void )
{
@ -4872,7 +4874,9 @@ void CGameMovement::IsometricMove( void )
mv->m_vecVelocity.Init();
}
#ifdef _WIN32
#pragma warning (default : 4701)
#endif
bool CGameMovement::GameHasLadders() const