From 42205f27fc820ddc64616d55c04e2ffde1948043 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 22 May 2020 01:54:20 +0100 Subject: refactor(3p/nix/libexpr): Use absl::btree_map::iterator type Instead of using a custom Args* iterator, use the one belonging to the map type directly. --- third_party/nix/src/libexpr/attr-set.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libexpr/attr-set.cc') diff --git a/third_party/nix/src/libexpr/attr-set.cc b/third_party/nix/src/libexpr/attr-set.cc index e0fac9234b14..2df6bc9a2155 100644 --- a/third_party/nix/src/libexpr/attr-set.cc +++ b/third_party/nix/src/libexpr/attr-set.cc @@ -31,12 +31,17 @@ std::vector Bindings::lexicographicOrder() { } Bindings::iterator Bindings::find(const Symbol& name) { - return &attributes_[name]; + return attributes_.find(name); } -Bindings::iterator Bindings::begin() { return &(attributes_.begin()->second); } +Bindings::iterator Bindings::begin() { + return attributes_.begin(); +} + +Bindings::iterator Bindings::end() { + return attributes_.end(); +} -Bindings::iterator Bindings::end() { return &(attributes_.end()->second); } void Bindings::merge(Bindings* other) { // We want the values from the other attribute set to take // precedence, but .merge() works the other way around. -- cgit 1.4.1