From ab1fbd4c6ec65966a28abbccc1efefe74d189bba Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 23 May 2020 20:19:13 +0100
Subject: fix(3p/nix/libexpr): Actually use AttributeMap type alias

Without this alias, the garbage-collecting allocator won't be used and
allocated attribute set values won't be visible during GC.
---
 third_party/nix/src/libexpr/attr-set.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'third_party/nix/src/libexpr/attr-set.hh')

diff --git a/third_party/nix/src/libexpr/attr-set.hh b/third_party/nix/src/libexpr/attr-set.hh
index cdfe9e41d5..19d1c8f530 100644
--- a/third_party/nix/src/libexpr/attr-set.hh
+++ b/third_party/nix/src/libexpr/attr-set.hh
@@ -38,7 +38,7 @@ using AttributeMap =
 
 class Bindings {
  public:
-  typedef absl::btree_map<Symbol, Attr>::iterator iterator;
+  typedef AttributeMap::iterator iterator;
 
   // Allocate a new attribute set that is visible to the garbage
   // collector.
@@ -79,7 +79,7 @@ class Bindings {
   friend class EvalState;
 
  private:
-  absl::btree_map<Symbol, Attr> attributes_;
+  AttributeMap attributes_;
 };
 
 }  // namespace nix
-- 
cgit 1.4.1