flat containers prototype

components/omnibox/browser/url_index_private_data.cc

Index: components/omnibox/browser/url_index_private_data.cc
diff --git a/components/omnibox/browser/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc
index a702948211f91be9e6200e557d338118999c1ef8..e50cce039dcde3e615910f81e3bb460c3f3a609d 100644
--- a/components/omnibox/browser/url_index_private_data.cc
+++ b/components/omnibox/browser/url_index_private_data.cc
@@ -253,7 +253,7 @@ ScoredHistoryMatches URLIndexPrivateData::HistoryItemsForTerms(
     for (SearchTermCacheMap::iterator cache_iter = search_term_cache_.begin();
          cache_iter != search_term_cache_.end(); ) {
       if (!cache_iter->second.used_)
-        search_term_cache_.erase(cache_iter++);
+        cache_iter = search_term_cache_.erase(cache_iter);

[Peter Kasting, 2016/11/29 19:17:45]

FWIW, now that C++11 provides this on std::map, we should just make this change
anyway (assuming it doesn't break one of our archaic libstdc++ implementations),
since it's more clearly safe.

[dyaroshev, 2016/11/29 20:09:14]

Some time ago there was a problem with the standard library on linux -
map::erase didn't provide modern interface.
(and vector erase too - there are work arounds against that in
flat_sorted_container_base.h and some tests here are disabled on linux).
I don't know if we updated since.

In my opinion this patch is good for illustrating purpose - maybe keep it as is,
at least for now?

[Peter Kasting, 2016/11/29 20:29:06]

I don't either.
We'd only update this patch to not have this if we were able to land this
separately :)

It'd probably be pretty easy to write a separate CL with just this line, to see
if it compiles everywhere.

       else
         ++cache_iter;
     }
@@ -605,7 +605,7 @@ HistoryIDSet URLIndexPrivateData::HistoryIDsForTerm(
     for (WordIDSet::iterator word_set_iter = word_id_set.begin();
          word_set_iter != word_id_set.end(); ) {
       if (word_list_[*word_set_iter].find(term) == base::string16::npos)
-        word_id_set.erase(word_set_iter++);
+        word_set_iter = word_id_set.erase(word_set_iter);
       else
         ++word_set_iter;
     }