diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-24 04:22:34 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-24 04:22:34 +0200 |
| commit | 3c9904123b6e2a07dff025f5e92c82d18afdad58 (patch) | |
| tree | 19221b394db54a73f75d403d03edca4ea37ff5b3 /sql/sql_list.h | |
| parent | 338cb6a83644debcb4fae9a8bdd8880294b30383 (diff) | |
| download | mariadb-git-3c9904123b6e2a07dff025f5e92c82d18afdad58.tar.gz | |
Fixed windows compilation problems
extra/yassl/taocrypt/mySTL/algorithm.hpp:
max is defined on windows
sql/sql_list.h:
Fixed compiler warning on windows
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index d16fbaf2e50..af30cbe0d6a 100644 --- a/sql/sql_list.h +++ b/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; |