1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 20:46:03 +08:00

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

This commit is contained in:
Scott Ehlert
2011-04-28 01:29:36 -05:00
parent 94dd57587b
commit 79f4a53df6
300 changed files with 1041 additions and 1084 deletions

View File

@ -227,9 +227,9 @@ float CPointAngularVelocitySensor::SampleAngularVelocity(CBaseEntity *pEntity)
else
{
QAngle vecAngVel = pEntity->GetLocalAngularVelocity();
float flMax = max(fabs(vecAngVel[PITCH]), fabs(vecAngVel[YAW]));
float flMax = MAX(fabs(vecAngVel[PITCH]), fabs(vecAngVel[YAW]));
return max(flMax, fabs(vecAngVel[ROLL]));
return MAX(flMax, fabs(vecAngVel[ROLL]));
}
return 0;