diff options
author | unknown <konstantin@mysql.com> | 2005-02-15 03:55:44 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-02-15 03:55:44 +0300 |
commit | de109e463bb699305bdcf116280c412dc7da2566 (patch) | |
tree | e5ff93ac27563eced6bb1f80cb893145a6ad90ae /sql/sql_string.h | |
parent | 92f55e98dd25ef7eaef40b026fba169dbf0a28dd (diff) | |
download | mariadb-git-de109e463bb699305bdcf116280c412dc7da2566.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.
sql/item.h:
Fix the signature of placement operator delete for class Item.
sql/sql_class.cc:
Add placement delete operator to suppress a warning under Windows.
sql/sql_lex.h:
Fix the signature of placement operator delete for class LEX
sql/sql_list.h:
Fix the signature of placement operator delete for class Sql_alloc
sql/sql_string.h:
Fix the signature of placement operator delete for class Sql_string
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 9136dddbbf2..3ad4689cf36 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -73,7 +73,7 @@ public: { return (void*) alloc_root(mem_root, (uint) size); } static void operator delete(void *ptr_arg,size_t size) {} - static void operator delete(void *ptr_arg,size_t size, MEM_ROOT *mem_root) + static void operator delete(void *ptr_arg, MEM_ROOT *mem_root) {} ~String() { free(); } |