mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Fixed windows compilation problems
This commit is contained in:
parent
520d1b4144
commit
3d34c6f957
2 changed files with 4 additions and 0 deletions
|
@ -27,6 +27,8 @@
|
|||
|
||||
namespace mySTL {
|
||||
|
||||
#undef max
|
||||
#undef min
|
||||
|
||||
template<typename T>
|
||||
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, 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…
Reference in a new issue