Fixed windows compilation problems

extra/yassl/taocrypt/mySTL/algorithm.hpp:
  max is defined on windows
sql/sql_list.h:
  Fixed compiler warning on windows
This commit is contained in:
unknown 2007-02-24 04:22:34 +02:00
parent 338cb6a836
commit 3c9904123b
2 changed files with 4 additions and 0 deletions

View File

@ -27,6 +27,8 @@
namespace mySTL {
#undef max
#undef min
template<typename T>
inline const T& max(const T& a, const T&b)

View File

@ -38,6 +38,8 @@ public:
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root)
{ /* never called */ }
static void operator delete[](void *ptr, MEM_ROOT *mem_root)
{ /* never called */ }
static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
#ifdef HAVE_purify
bool dummy;