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
@@ -2042,7 +2042,7 @@ void Physics_RunThinkFunctions( bool simulating )
{
UTIL_DisableRemoveImmediate();
int listMax = SimThink_ListCount();
listMax = max(listMax,1);
listMax = MAX(listMax,1);
CBaseEntity **list = (CBaseEntity **)stackalloc( sizeof(CBaseEntity *) * listMax );
// iterate through all entities and have them think or simulate