aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libutil/lru-cache.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libutil/lru-cache.hh b/src/libutil/lru-cache.hh
index 3cb5d5088..9b8290e63 100644
--- a/src/libutil/lru-cache.hh
+++ b/src/libutil/lru-cache.hh
@@ -2,6 +2,7 @@
#include <map>
#include <list>
+#include <experimental/optional>
namespace nix {
@@ -63,18 +64,17 @@ public:
/* Look up an item in the cache. If it exists, it becomes the most
recently used item. */
- // FIXME: use boost::optional?
- Value * get(const Key & key)
+ std::experimental::optional<Value> get(const Key & key)
{
auto i = data.find(key);
- if (i == data.end()) return 0;
+ if (i == data.end()) return {};
/* Move this item to the back of the LRU list. */
lru.erase(i->second.first.it);
auto j = lru.insert(lru.end(), i);
i->second.first.it = j;
- return &i->second.second;
+ return i->second.second;
}
size_t size()