github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-04 17:59:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix lru.h compilation on Yosemite

Browse Source 
The LRU cache wants to store references from nodes back into the
lookup map, so that it is efficient to remove a node from the
map. However certain compilers refuse to form a std::map::iterator
with an incomplete type. Fix this by storing a pointer to the key
instead of the iterator.

(cherry picked from commit 523dc6da6da263629f04848e8c87267b9444e3d5)
This commit is contained in:
ridiculousfish 2017-05-15 09:11:40 -07:00 committed by David Adam
parent 426653a9d7
commit 4050166738
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lru.h
View File

@ -38,8 +38,8 @@ class lru_cache_t {
lru_node_t &operator=(const lru_node_t &) = delete; lru_node_t &operator=(const lru_node_t &) = delete;
lru_node_t(lru_node_t &&) = default; lru_node_t(lru_node_t &&) = default;
// Our location in the map! // Our key in the map. This is owned by the map itself.
node_iter_t iter; const wcstring *key;
// The value from the client // The value from the client
CONTENTS value; CONTENTS value;
@ -78,21 +78,23 @@ class lru_cache_t {
// Remove the node // Remove the node
void evict_node(lru_node_t *node) { void evict_node(lru_node_t *node) {
assert(node != &mouth);
// We should never evict the mouth. // We should never evict the mouth.
assert(node != NULL && node->iter != this->node_map.end()); assert(node != &mouth && node != NULL && node->key != NULL);
auto iter = this->node_map.find(*node->key);
assert(iter != this->node_map.end());
// Remove it from the linked list. // Remove it from the linked list.
node->prev->next = node->next; node->prev->next = node->next;
node->next->prev = node->prev; node->next->prev = node->prev;
// Pull out our key and value // Pull out our key and value
wcstring key = std::move(node->iter->first); // Note we copy the key in case the map needs it to erase the node
wcstring key = *node->key;
CONTENTS value(std::move(node->value)); CONTENTS value(std::move(node->value));
// Remove us from the map. This deallocates node! // Remove us from the map. This deallocates node!
node_map.erase(node->iter); node_map.erase(iter);
// Tell ourselves what we did // Tell ourselves what we did
DERIVED *dthis = static_cast<DERIVED *>(this); DERIVED *dthis = static_cast<DERIVED *>(this);
@ -228,7 +230,7 @@ class lru_cache_t {
// Tell the node where it is in the map // Tell the node where it is in the map
node_iter_t iter = iter_inserted.first; node_iter_t iter = iter_inserted.first;
lru_node_t *node = &iter->second; lru_node_t *node = &iter->second;
node->iter = iter; node->key = &iter->first;
node->next = mouth.next; node->next = mouth.next;
node->next->prev = node; node->next->prev = node;
@ -285,8 +287,7 @@ class lru_cache_t {
bool operator!=(const iterator &other) { return !(*this == other); } bool operator!=(const iterator &other) { return !(*this == other); }
value_type operator*() const { value_type operator*() const {
const lru_node_t *dnode = static_cast<const lru_node_t *>(node); const lru_node_t *dnode = static_cast<const lru_node_t *>(node);
const wcstring &key = dnode->iter->first; return {*dnode->key, dnode->value};
return {key, dnode->value};
} }
}; };