diff options
author | konstantin@mysql.com <> | 2005-02-15 03:55:44 +0300 |
---|---|---|
committer | konstantin@mysql.com <> | 2005-02-15 03:55:44 +0300 |
commit | f7512e756f554fbab864c3a3998f2bdf62dc5daf (patch) | |
tree | e5ff93ac27563eced6bb1f80cb893145a6ad90ae /sql/sql_list.h | |
parent | c30f7feba1c0e64b1071b6edda2c4d2ec980844d (diff) | |
download | mariadb-git-f7512e756f554fbab864c3a3998f2bdf62dc5daf.tar.gz |
Fix signatures of placement operator delete in places where placement
delete is declared. As we don't use exceptions placement delete is never
called and the fix only affects numerous warnings when
compiling with MS Visual C++.
For more info see http://www.gotw.ca/gotw/010.htm.
Diffstat (limited to 'sql/sql_list.h')
-rw-r--r-- | sql/sql_list.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index a607b31d60c..be3e29b0c62 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -41,8 +41,8 @@ public: static void *operator new(size_t size, MEM_ROOT *mem_root) { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); } - static void operator delete(void *ptr, size_t size, MEM_ROOT *mem_root) - { TRASH(ptr, size); } + 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; |