about summary refs log tree commit diff
path: root/third_party/nix/src
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-23T19·19+0100
committerVincent Ambo <tazjin@google.com>2020-05-23T19·19+0100
commitab1fbd4c6ec65966a28abbccc1efefe74d189bba (patch)
tree994c9cf4321b1122082dd8484da1c9bbb9e2332e /third_party/nix/src
parent39e72c27f16b9bb07895e2a2d2d3a16f43449939 (diff)
fix(3p/nix/libexpr): Actually use AttributeMap type alias r/827
Without this alias, the garbage-collecting allocator won't be used and
allocated attribute set values won't be visible during GC.
Diffstat (limited to 'third_party/nix/src')
-rw-r--r--third_party/nix/src/libexpr/attr-set.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libexpr/attr-set.hh b/third_party/nix/src/libexpr/attr-set.hh
index cdfe9e41d5af..19d1c8f530e4 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