1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00

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

This commit is contained in:
Scott Ehlert
2011-04-28 01:28:41 -05:00
parent afe9f41508
commit 14deb350cf
265 changed files with 904 additions and 947 deletions

View File

@ -733,7 +733,7 @@ public:
#else
WRITE_STRING( lowercase );
#endif
WRITE_SHORT( min( 255, (int)( duration * 10.0f ) ) ),
WRITE_SHORT( MIN( 255, (int)( duration * 10.0f ) ) ),
WRITE_BYTE( byteflags ),
MessageEnd();
#else