Skip to content

Commit c5ae2c4

Browse files
committed
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.
1 parent a880ef5 commit c5ae2c4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

storage/innobase/fsp/fsp0file.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ Datafile::find_space_id()
614614
typedef std::map<
615615
uint32_t,
616616
uint32_t,
617-
std::less<ulint>,
618-
ut_allocator<std::pair<const ulint, ulint> > >
617+
std::less<uint32_t>,
618+
ut_allocator<std::pair<const uint32_t, uint32_t> > >
619619
Pages;
620620

621621
Pages verify;

storage/innobase/log/log0recv.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ struct file_name_t {
579579
typedef std::map<
580580
uint32_t,
581581
file_name_t,
582-
std::less<ulint>,
583-
ut_allocator<std::pair<const ulint, file_name_t> > > recv_spaces_t;
582+
std::less<uint32_t>,
583+
ut_allocator<std::pair<const uint32_t, file_name_t> > > recv_spaces_t;
584584

585585
static recv_spaces_t recv_spaces;
586586

0 commit comments

Comments
 (0)