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:29:54 -05:00
1 parent d529bf38f5
commit 85773fe42c
300 files changed
+1041 -1084

No files matched your search

+1 -1
View File
@@ -227,7 +227,7 @@ void CNavNode::CheckCrouch( void )
float floorZ;
if ( TheNavMesh->GetGroundHeight( m_pos, &floorZ ) )
{
maxFloorZ = max( maxFloorZ, floorZ + 0.1f );
maxFloorZ = MAX( maxFloorZ, floorZ + 0.1f );
}
}
}