Skip to content

M
mariadb
Commit 3d34c6f9 authored by monty@mysql.com/narttu.mysql.fi's avatar monty@mysql.com/narttu.mysql.fi
Browse files
Options

Fixed windows compilation problems

parent 520d1b41
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
extra/yassl/taocrypt/mySTL/algorithm.hpp
View file @ 3d34c6f9
...@@ -27,6 +27,8 @@ ...@@ -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)
......
sql/sql_list.h
View file @ 3d34c6f9
...@@ -38,6 +38,8 @@ public: ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7