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
@@ -624,7 +624,7 @@ bool CGamePlayerEquip::KeyValue( const char *szKeyName, const char *szValue )
m_weaponNames[i] = AllocPooledString(tmp);
m_weaponCount[i] = atoi(szValue);
m_weaponCount[i] = max(1,m_weaponCount[i]);
m_weaponCount[i] = MAX(1,m_weaponCount[i]);
return true;
}
}