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
@@ -75,7 +75,7 @@ void CSoundEnvelope::SetTarget( float target, float deltaTime )
if ( deltaValue && deltaTime > 0 )
{
m_target = target;
m_rate = max( 0.1, fabs(deltaValue / deltaTime) );
m_rate = MAX( 0.1, fabs(deltaValue / deltaTime) );
}
else
{