From 83acbe10023f411e0f412d1b12734a9a5400149c Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 18 Dec 2019 23:15:28 +0100
Subject: [PATCH] input/cache: use simpler intrusive::set API
---
src/input/cache/Manager.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/input/cache/Manager.cxx b/src/input/cache/Manager.cxx
index 3ff51d88e..e6911c666 100644
--- a/src/input/cache/Manager.cxx
+++ b/src/input/cache/Manager.cxx
@@ -81,11 +81,9 @@ InputCacheManager::Get(const char *uri, bool create)
if (!PathTraitsUTF8::IsAbsolute(uri))
return {};
- UriMap::insert_commit_data hint;
- auto result = items_by_uri.insert_check(uri, items_by_uri.key_comp(),
- hint);
- if (!result.second) {
- auto &item = *result.first;
+ auto iter = items_by_uri.find(uri, items_by_uri.key_comp());
+ if (iter != items_by_uri.end()) {
+ auto &item = *iter;
/* refresh */
items_by_time.erase(items_by_time.iterator_to(item));
@@ -112,7 +110,7 @@ InputCacheManager::Get(const char *uri, bool create)
while (total_size > max_total_size && EvictOldestUnused()) {}
auto *item = new InputCacheItem(std::move(is));
- items_by_uri.insert_commit(*item, hint);
+ items_by_uri.insert(*item);
items_by_time.push_back(*item);
return InputCacheLease(*item);