Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 04:26:03 +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:29:22 -05:00
parent 88dd2ac536
commit 7f4855ae1f
265 changed files with 904 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tier1/strtools.cpp
View File

@ -680,7 +680,7 @@ char *V_strncat(char *pDest, const char *pSrc, size_t destBufferSize, int max_ch
}
else
{
charstocopy = (size_t)min( max_chars_to_copy, (int)srclen );
charstocopy = (size_t)MIN( max_chars_to_copy, (int)srclen );
}
if ( len + charstocopy >= destBufferSize )
@ -745,7 +745,7 @@ char *V_pretifymem( float value, int digitsafterdecimal /*= 2*/, bool usebinaryo
char val[ 32 ];
// Clamp to >= 0
digitsafterdecimal = max( digitsafterdecimal, 0 );
digitsafterdecimal = MAX( digitsafterdecimal, 0 );
// If it's basically integral, don't do any decimals
if ( FloatMakePositive( value - (int)value ) < 0.00001 )
@ -954,7 +954,7 @@ static unsigned char V_nibble( char c )
void V_hextobinary( char const *in, int numchars, byte *out, int maxoutputbytes )
{
int len = V_strlen( in );
numchars = min( len, numchars );
numchars = MIN( len, numchars );
// Make sure it's even
numchars = ( numchars ) & ~0x1;
@ -1062,7 +1062,7 @@ void V_FileBase( const char *in, char *out, int maxlen )
// Length of new sting
len = end - start + 1;
int maxcopy = min( len + 1, maxlen );
int maxcopy = MIN( len + 1, maxlen );
// Copy partial string
V_strncpy( out, &in[start], maxcopy );
@ -1112,7 +1112,7 @@ void V_StripExtension( const char *in, char *out, int outSize )
if ( pLastExt > in )
{
int nChars = pLastExt - in - 1;
nChars = min( nChars, outSize-1 );
nChars = MIN( nChars, outSize-1 );
memcpy( out, in, nChars );
out[nChars] = 0;
}
@ -1322,7 +1322,7 @@ bool V_ExtractFilePath (const char *path, char *dest, int destSize )
src--;
}
int copysize = min( src - path, destSize - 1 );
int copysize = MIN( src - path, destSize - 1 );
memcpy( dest, path, copysize );
dest[copysize] = 0;
@ -1596,7 +1596,7 @@ char* AllocString( const char *pStr, int nMaxChars )
if ( nMaxChars == -1 )
allocLen = strlen( pStr ) + 1;
else
allocLen = min( (int)strlen(pStr), nMaxChars ) + 1;
allocLen = MIN( (int)strlen(pStr), nMaxChars ) + 1;
char *pOut = new char[allocLen];
V_strncpy( pOut, pStr, allocLen );