Commit 3c990412 authored by unknown's avatar unknown
Browse files

Fixed windows compilation problems 


extra/yassl/taocrypt/mySTL/algorithm.hpp:
  max is defined on windows
sql/sql_list.h:
  Fixed compiler warning on windows
parent 338cb6a8

extra/yassl/taocrypt/mySTL/algorithm.hpp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 


namespace mySTL {



#undef max

#undef min



template<typename T>

inline const T& max(const T& a, const T&b)

sql/sql_list.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ class Sql_alloc 
  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;