Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00
Code Activity

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert
2011-04-28 01:30:09 -05:00
parent b9b7f08197
commit 3e7f7bdabd
300 changed files with 1041 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/smooth_average.h
View File

@ -123,12 +123,12 @@ inline CTimingInfo< T > CalcSmoothAverage_Struct( const T &value, int nTimes, co
{
if ( i != newValueIndex )
{
info.m_HighAverage = max( pInfo->m_Values[i].m_Average, info.m_HighAverage );
info.m_LowAverage = min( pInfo->m_Values[i].m_Average, info.m_LowAverage );
info.m_HighAverage = MAX( pInfo->m_Values[i].m_Average, info.m_HighAverage );
info.m_LowAverage = MIN( pInfo->m_Values[i].m_Average, info.m_LowAverage );
}
info.m_HighValue = max( pInfo->m_Values[i].m_Value, info.m_HighValue );
info.m_LowValue = min( pInfo->m_Values[i].m_Value, info.m_LowValue );
info.m_HighValue = MAX( pInfo->m_Values[i].m_Value, info.m_HighValue );
info.m_LowValue = MIN( pInfo->m_Values[i].m_Value, info.m_LowValue );
info.m_AverageValue += pInfo->m_Values[i].m_Value;
}
@ -194,12 +194,12 @@ inline CTimingInfo< T > SumOverTimeInterval_Struct( const T &value, float nSecon
{
if ( i != newValueIndex )
{
info.m_HighAverage = max( pInfo->m_Values[i].m_Average, info.m_HighAverage );
info.m_LowAverage = min( pInfo->m_Values[i].m_Average, info.m_LowAverage );
info.m_HighAverage = MAX( pInfo->m_Values[i].m_Average, info.m_HighAverage );
info.m_LowAverage = MIN( pInfo->m_Values[i].m_Average, info.m_LowAverage );
}
info.m_HighValue = max( pInfo->m_Values[i].m_Value, info.m_HighValue );
info.m_LowValue = min( pInfo->m_Values[i].m_Value, info.m_LowValue );
info.m_HighValue = MAX( pInfo->m_Values[i].m_Value, info.m_HighValue );
info.m_LowValue = MIN( pInfo->m_Values[i].m_Value, info.m_LowValue );
info.m_AverageValue += pInfo->m_Values[i].m_Value;
}