diff options
| author | Knut Anders Hatlen <knut.hatlen@oracle.com> | 2016-11-04 13:44:36 +0100 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-26 23:03:29 +0300 |
| commit | 9df04261035638cdf55237decf4cacab256fb473 (patch) | |
| tree | bc5c4abc3573a486c2250099a35b44bb8aef3d25 /storage/innobase/sync | |
| parent | 8923f6b741498a1bea8bd49a6debec0a9fa490c9 (diff) | |
| download | mariadb-git-9df04261035638cdf55237decf4cacab256fb473.tar.gz | |
Bug#25048573: STD::MAP INSTANTIATIONS CAUSE STATIC ASSERT FAILURES ON FREEBSD 11
Problem: Some instantiations of std::map have discrepancies between
the value_type of the map and the value_type of the map's allocator.
On FreeBSD 11 this is detected by Clang, and an error is raised at
compilation time.
Fix: Specify the correct value_type for the allocators.
Also fix an unused variable warning in storage/innobase/os/os0file.cc.
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0debug.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/sync/sync0debug.cc b/storage/innobase/sync/sync0debug.cc index 135c84ad0d8..c787a32e58a 100644 --- a/storage/innobase/sync/sync0debug.cc +++ b/storage/innobase/sync/sync0debug.cc @@ -130,7 +130,7 @@ struct LatchDebug { os_thread_id_t, Latches*, os_thread_id_less, - ut_allocator<std::pair<const std::string, latch_meta_t> > > + ut_allocator<std::pair<const os_thread_id_t, Latches*> > > ThreadMap; /** Constructor */ @@ -425,7 +425,7 @@ private: latch_level_t, std::string, latch_level_less, - ut_allocator<std::pair<latch_level_t, std::string> > > + ut_allocator<std::pair<const latch_level_t, std::string> > > Levels; /** Mutex protecting the deadlock detector data structures. */ @@ -1717,7 +1717,7 @@ private: const void*, File, std::less<const void*>, - ut_allocator<std::pair<const void*, File> > > + ut_allocator<std::pair<const void* const, File> > > Files; typedef OSMutex Mutex; |