From: Todd D. P. <ci...@us...> - 2003-09-24 02:08:51
|
Log Message: ----------- just keeping things backward compatible compilerwise also figured if we're using std::max might as well use std::min too Modified Files: -------------- /cvsroot/decaldev/source/DecalControls: StdAfx.h Revision Data ------------- Index: StdAfx.h =================================================================== RCS file: /cvsroot/decaldev/source/DecalControls/StdAfx.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- StdAfx.h 23 Sep 2003 05:18:30 -0000 1.6 +++ StdAfx.h 24 Sep 2003 02:08:49 -0000 1.7 @@ -13,7 +13,20 @@ #define _WIN32_WINDOWS 0x0410 #define _ATL_APARTMENT_THREADED +// Don't use macros for min() and max()!!! +#define NOMINMAX + #include <atlbase.h> + +// Keep things backward compatible +#if defined(_MSC_VER) && _MSC_VER <= 1200 +#define min std::_cpp_min +#define max std::_cpp_max +#else +using std::min; +using std::max; +#endif + //You may derive a class from CComModule and use it if you want to override //something, but do not change the name of _Module extern CComModule _Module; @@ -27,7 +40,6 @@ #include <string> #include "..\Inject\Inject.h" #import <msxml.dll> -using std::max; #ifdef _CHECKMEM #define _ASSERTMEM(a) _ASSERTE(a) |