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

This commit is contained in:
Scott Ehlert committed 2011-04-28 01:30:09 -05:00
1 parent b9b7f08197
commit 3e7f7bdabd
300 files changed
+1041 -1084

No files matched your search

+2 -2
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;