Snap for 8730993 from b7c9dafe99969a4e9d5ffa101bb9a8d6e1df69df to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Iab4fa0d9b620eddf41ca88e1eb5547f79c316203

1 files changed, 18 insertions, 63 deletions

diff --git a/third_party/abseil-cpp/absl/container/btree_set.h b/third_party/abseil-cpp/absl/container/btree_set.h
index 8973900693..127fb940d4 100644
--- a/third_party/abseil-cpp/absl/container/btree_set.h
+++ b/third_party/abseil-cpp/absl/container/btree_set.h
@@ -183,7 +183,7 @@ class btree_set
   // template <typename K> size_type erase(const K& key):
   //
   //   Erases the element with the matching key, if it exists, returning the
-  //   number of elements erased (0 or 1).
+  //   number of elements erased.
   using Base::erase;
 
   // btree_set::insert()
@@ -263,7 +263,7 @@ class btree_set
   //   Extracts the element at the indicated position and returns a node handle
   //   owning that extracted data.
   //
-  // template <typename K> node_type extract(const K& k):
+  // template <typename K> node_type extract(const K& x):
   //
   //   Extracts the element with the key matching the passed key value and
   //   returns a node handle owning that extracted data. If the `btree_set`
@@ -300,8 +300,8 @@ class btree_set
   // Determines whether an element comparing equal to the given `key` exists
   // within the `btree_set`, returning `true` if so or `false` otherwise.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::contains;
 
   // btree_set::count()
@@ -312,8 +312,8 @@ class btree_set
   // the `btree_set`. Note that this function will return either `1` or `0`
   // since duplicate elements are not allowed within a `btree_set`.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::count;
 
   // btree_set::equal_range()
@@ -330,32 +330,10 @@ class btree_set
   //
   // Finds an element with the passed `key` within the `btree_set`.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::find;
 
-  // btree_set::lower_bound()
-  //
-  // template <typename K> iterator lower_bound(const K& key):
-  // template <typename K> const_iterator lower_bound(const K& key) const:
-  //
-  // Finds the first element that is not less than `key` within the `btree_set`.
-  //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
-  using Base::lower_bound;
-
-  // btree_set::upper_bound()
-  //
-  // template <typename K> iterator upper_bound(const K& key):
-  // template <typename K> const_iterator upper_bound(const K& key) const:
-  //
-  // Finds the first element that is greater than `key` within the `btree_set`.
-  //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
-  using Base::upper_bound;
-
   // btree_set::get_allocator()
   //
   // Returns the allocator function associated with this `btree_set`.
@@ -589,7 +567,7 @@ class btree_multiset
   //   Extracts the element at the indicated position and returns a node handle
   //   owning that extracted data.
   //
-  // template <typename K> node_type extract(const K& k):
+  // template <typename K> node_type extract(const K& x):
   //
   //   Extracts the element with the key matching the passed key value and
   //   returns a node handle owning that extracted data. If the `btree_multiset`
@@ -604,8 +582,9 @@ class btree_multiset
 
   // btree_multiset::merge()
   //
-  // Extracts all elements from a given `source` btree_multiset into this
-  // `btree_multiset`.
+  // Extracts elements from a given `source` btree_multiset into this
+  // `btree_multiset`. If the destination `btree_multiset` already contains an
+  // element with an equivalent key, that element is not extracted.
   using Base::merge;
 
   // btree_multiset::swap(btree_multiset& other)
@@ -625,8 +604,8 @@ class btree_multiset
   // Determines whether an element comparing equal to the given `key` exists
   // within the `btree_multiset`, returning `true` if so or `false` otherwise.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::contains;
 
   // btree_multiset::count()
@@ -636,8 +615,8 @@ class btree_multiset
   // Returns the number of elements comparing equal to the given `key` within
   // the `btree_multiset`.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::count;
 
   // btree_multiset::equal_range()
@@ -654,34 +633,10 @@ class btree_multiset
   //
   // Finds an element with the passed `key` within the `btree_multiset`.
   //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
+  // Supports heterogeneous lookup, provided that the set is provided a
+  // compatible heterogeneous comparator.
   using Base::find;
 
-  // btree_multiset::lower_bound()
-  //
-  // template <typename K> iterator lower_bound(const K& key):
-  // template <typename K> const_iterator lower_bound(const K& key) const:
-  //
-  // Finds the first element that is not less than `key` within the
-  // `btree_multiset`.
-  //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
-  using Base::lower_bound;
-
-  // btree_multiset::upper_bound()
-  //
-  // template <typename K> iterator upper_bound(const K& key):
-  // template <typename K> const_iterator upper_bound(const K& key) const:
-  //
-  // Finds the first element that is greater than `key` within the
-  // `btree_multiset`.
-  //
-  // Supports heterogeneous lookup, provided that the set has a compatible
-  // heterogeneous comparator.
-  using Base::upper_bound;
-
   // btree_multiset::get_allocator()
   //
   // Returns the allocator function associated with this `btree_multiset`.