Browse Source

Fixed windows compilation problems

extra/yassl/taocrypt/mySTL/algorithm.hpp:
  max is defined on windows
sql/sql_list.h:
  Fixed compiler warning on windows
pull/374/head
unknown 19 years ago
parent
commit
3c9904123b
  1. 2
      extra/yassl/taocrypt/mySTL/algorithm.hpp
  2. 2
      sql/sql_list.h

2
extra/yassl/taocrypt/mySTL/algorithm.hpp

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

2
sql/sql_list.h

@ -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;

Loading…
Cancel
Save