mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-12 00:38:00 +08:00
Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.
This commit is contained in:
1 parent
b9b7f08197
commit
3e7f7bdabd
300 files changed
+1041
-1084
No files matched your search
@@ -271,7 +271,7 @@ public:
|
||||
|
||||
if ( pItem )
|
||||
{
|
||||
int nObjects = min( header.nObjects, pItem->header.nObjects );
|
||||
int nObjects = MIN( header.nObjects, pItem->header.nObjects );
|
||||
if ( pItem->header.type == PIID_IPHYSICSOBJECT && nObjects == 1 )
|
||||
{
|
||||
RestorePhysicsObjectAndModel( pRestore, header, pItem, nObjects );
|
||||
|
||||
Reference in new issue
Block a user