diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-29 14:33:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-29 15:11:06 +0300 |
| commit | 5fb4c0a8a877077e2835a9b39ac6e670fa4eaaac (patch) | |
| tree | 05c9ff96d83bcc0568e3c17016e9f4af8f057d2b /storage/innobase/buf/buf0buddy.cc | |
| parent | bdd6e33f00bff927358a7b03798a285ff41b35b7 (diff) | |
| download | mariadb-git-5fb4c0a8a877077e2835a9b39ac6e670fa4eaaac.tar.gz | |
Clean up ut_list
ut_list_validate(), ut_list_map(): Add variants with const Functor&
so that these functions can be called with an rvalue.
Remove wrapper macros, and add #ifdef UNIV_DEBUG around debug-only code.
Diffstat (limited to 'storage/innobase/buf/buf0buddy.cc')
| -rw-r--r-- | storage/innobase/buf/buf0buddy.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc index 777188d045d..d4e47f136ac 100644 --- a/storage/innobase/buf/buf0buddy.cc +++ b/storage/innobase/buf/buf0buddy.cc @@ -175,13 +175,13 @@ buf_buddy_get( struct CheckZipFree { CheckZipFree(ulint i) : m_i(i) {} - void operator()(const buf_buddy_free_t* elem) const + void operator()(const buf_buddy_free_t* elem) const { - ut_a(buf_buddy_stamp_is_free(elem)); - ut_a(elem->stamp.size <= m_i); + ut_ad(buf_buddy_stamp_is_free(elem)); + ut_ad(elem->stamp.size <= m_i); } - ulint m_i; + const ulint m_i; }; /** Validate a buddy list. @@ -193,8 +193,7 @@ buf_buddy_list_validate( const buf_pool_t* buf_pool, ulint i) { - CheckZipFree check(i); - ut_list_validate(buf_pool->zip_free[i], check); + ut_list_validate(buf_pool->zip_free[i], CheckZipFree(i)); } /**********************************************************************//** |