[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/o3tl

[Jan-Marek Glogowski (via logerrit)]

 include/o3tl/lru_map.hxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit de8d2dd156b895ad5ac71a2d44f424d13a0a4a31
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Oct 5 22:02:45 2018 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu May 23 14:18:57 2019 +0200

    lru_map: fix std::move insert
    
    After the move the std::pair is invalid.
    That caused invalid iterators on lookups - hard to debug...
    Also adds an assertion to warn if size of map and list differ.
    
    Change-Id: Ib987d47963d5e1009d64a96dcdd588a0bc27cd77
    Reviewed-on: https://gerrit.libreoffice.org/61451
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit e7d5bad5ae083da12c3ec4a4a8bdc8b42447a242)

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index aeb27378d96a..003da59551b5 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -11,6 +11,7 @@
 #ifndef INCLUDED_O3TL_LRU_MAP_HXX
 #define INCLUDED_O3TL_LRU_MAP_HXX
 
+#include <cassert>
 #include <list>
 #include <unordered_map>