always use min/max workaround in vc6

This commit is contained in:
Glenn Maynard
2002-10-31 05:18:08 +00:00
parent 07a04df7d7
commit 679fce4ef2
+9 -3
View File
@@ -34,6 +34,7 @@
#define NOMINMAX /* make sure Windows doesn't try to define this */ #define NOMINMAX /* make sure Windows doesn't try to define this */
#include <afxwin.h> // MFC core and standard components #include <afxwin.h> // MFC core and standard components
/* Make sure everyone has min and max: */ /* Make sure everyone has min and max: */
#include <algorithm> #include <algorithm>
@@ -55,10 +56,11 @@ using namespace std;
#include <dinput.h> #include <dinput.h>
#if 0 #if 0
#include "StdString.h"
/* Use CStdString: */ /* Use CStdString: */
#include "StdString.h"
#define CString CStdString #define CString CStdString
#else #else
/* Wrapper to use getline() on MFC strings. */ /* Wrapper to use getline() on MFC strings. */
@@ -87,6 +89,12 @@ public:
}; };
#define CString CStringTemp #define CString CStringTemp
#endif
#endif
#if _MSC_VER < 1300 /* VC6, not VC7 */
/* VC6's <algorithm> is doesn't actually define min and max. */ /* VC6's <algorithm> is doesn't actually define min and max. */
template<class T> template<class T>
inline const T& max(const T &a, const T &b) inline const T& max(const T &a, const T &b)
@@ -103,8 +111,6 @@ inline const T& min(const T &a, const T &b, P Pr)
#endif #endif
#endif
template <class Type, class IGNOREME> template <class Type, class IGNOREME>
class StdCArray: public std::vector<Type> {}; class StdCArray: public std::vector<Type> {};
#define CArray StdCArray #define CArray StdCArray