mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-11 16:48:00 +08:00
Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.
This commit is contained in:
1 parent
b9b7f08197
commit
3e7f7bdabd
300 files changed
+1041
-1084
No files matched your search
@@ -141,7 +141,7 @@ public:
|
||||
{
|
||||
T maxsofar = -16000000;
|
||||
for( int i = 0; i < STATS_WINDOW_SIZE; i++ )
|
||||
maxsofar = max( maxsofar, m_StatsBuffer[i].*field );
|
||||
maxsofar = MAX( maxsofar, m_StatsBuffer[i].*field );
|
||||
return maxsofar;
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ public:
|
||||
{
|
||||
T minsofar = 16000000;
|
||||
for( int i = 0; i < STATS_WINDOW_SIZE; i++ )
|
||||
minsofar = min( minsofar, m_StatsBuffer[i].*field );
|
||||
minsofar = MIN( minsofar, m_StatsBuffer[i].*field );
|
||||
return minsofar;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user