diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-30 12:38:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-30 12:38:35 +0300 |
| commit | c5ae2c4971127290335588c7498f24d10f32e204 (patch) | |
| tree | 129a68fd0f4c7d2d80ac019c8ebee5cdbbfca847 | |
| parent | a880ef57efdcf71678851fd236d4b29edb9847fa (diff) | |
| download | mariadb-git-c5ae2c4971127290335588c7498f24d10f32e204.tar.gz | |
MDEV-26195 fixup: Inconsistent types for template instantiation
On Xcode on Mac OS X 11.3, a static_assert caught this mismatch.
Thanks to Dmitry Shulga for pointing this out.
| -rw-r--r-- | storage/innobase/fsp/fsp0file.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc index b8c355b13e9..09515bf0929 100644 --- a/storage/innobase/fsp/fsp0file.cc +++ b/storage/innobase/fsp/fsp0file.cc @@ -614,8 +614,8 @@ Datafile::find_space_id() typedef std::map< uint32_t, uint32_t, - std::less<ulint>, - ut_allocator<std::pair<const ulint, ulint> > > + std::less<uint32_t>, + ut_allocator<std::pair<const uint32_t, uint32_t> > > Pages; Pages verify; diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index bb7cb6a0498..1d85b0ad18d 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -579,8 +579,8 @@ struct file_name_t { typedef std::map< uint32_t, file_name_t, - std::less<ulint>, - ut_allocator<std::pair<const ulint, file_name_t> > > recv_spaces_t; + std::less<uint32_t>, + ut_allocator<std::pair<const uint32_t, file_name_t> > > recv_spaces_t; static recv_spaces_t recv_spaces; |