database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixed windows compilation problems

Browse Source
This commit is contained in:
monty@mysql.com/narttu.mysql.fi
2007-02-24 04:22:34 +02:00
parent 520d1b4144
commit 3d34c6f957
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
sql/sql_list.h
View File

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