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:
parent
338cb6a836
commit
3c9904123b
@ -27,6 +27,8 @@
|
|||||||
|
|
||||||
namespace mySTL {
|
namespace mySTL {
|
||||||
|
|
||||||
|
#undef max
|
||||||
|
#undef min
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
inline const T& max(const T& a, const T&b)
|
inline const T& max(const T& a, const T&b)
|
||||||
|
@ -38,6 +38,8 @@ public:
|
|||||||
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
|
static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); }
|
||||||
static void operator delete(void *ptr, MEM_ROOT *mem_root)
|
static void operator delete(void *ptr, MEM_ROOT *mem_root)
|
||||||
{ /* never called */ }
|
{ /* 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); }
|
static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); }
|
||||||
#ifdef HAVE_purify
|
#ifdef HAVE_purify
|
||||||
bool dummy;
|
bool dummy;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user