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

+1 -1
View File
@@ -240,7 +240,7 @@ void CSoundscapeSystem::FrameUpdatePostEntityThink()
// update 2 soundscape entities each tick. (when debugging update
// them all)
int count = soundscape_debug.GetBool() ? total : min(2, total);
int count = soundscape_debug.GetBool() ? total : MIN(2, total);
for ( int i = 0; i < count; i++ )
{
m_activeIndex++;