diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-20 21:17:36 +0000 |
commit | 56e7b7eaede52e8d2123e909d7d42220f8c63143 (patch) | |
tree | 73e1dc4b2e53d68c3a9d5269f9140142ef08c187 /sql/sql_alloc.h | |
parent | 9d97e6010ebdeab0579a8371d01f34118c518b30 (diff) | |
download | mariadb-git-56e7b7eaede52e8d2123e909d7d42220f8c63143.tar.gz |
Make possible to use clang on Windows (clang-cl)
-DWITH_ASAN can be used as well now, on x64
Fix many clang-cl warnings.
Diffstat (limited to 'sql/sql_alloc.h')
-rw-r--r-- | sql/sql_alloc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h index e7cda5b2abf..c3bee260817 100644 --- a/sql/sql_alloc.h +++ b/sql/sql_alloc.h @@ -27,13 +27,11 @@ class Sql_alloc public: static void *operator new(size_t size) throw () { - DBUG_ASSERT(size < UINT_MAX32); - return thd_alloc(thd_get_current_thd(), uint(size)); + return thd_alloc(thd_get_current_thd(), size); } static void *operator new[](size_t size) throw () { - DBUG_ASSERT(size < UINT_MAX32); - return thd_alloc(thd_get_current_thd(), uint(size)); + return thd_alloc(thd_get_current_thd(), size); } static void *operator new[](size_t size, MEM_ROOT *mem_root) throw () { return alloc_root(mem_root, size); } |