diff options
| author |  Abseil Team <absl-team@google.com> | 2021-09-22 12:57:35 -0700 |
|---|---|---|
| committer |  Andy Getz <durandal@google.com> | 2021-09-22 16:01:25 -0400 |
| commit | 020619c4aa68d13dfbdd6107a373912bb5ea85af (patch) | |
| tree | 7dd82abe7d166ff8c4a79fd2ff50fd3a0d2f128b /absl/container/btree_map.h | |
| parent | d4af654d971cc46cde6213269a364cdf170fe0ce (diff) | |
Export of internal Abseil changes
--
336f161ad8cb2cc3e1a6bbcbbb8c5b692ee59789 by Derek Mauro <dmauro@google.com>:
Internal change
PiperOrigin-RevId: 398308807
--
80d512823d17561a45feca81f37713a91a175349 by Abseil Team <absl-team@google.com>:
Internal change.
PiperOrigin-RevId: 398257218
--
f1f9792000355eb1d0c11b17800048491662a218 by Abseil Team <absl-team@google.com>:
Fix documentation for btree_multi{map,set}::merge to match behavior for elements with equivalent keys.
PiperOrigin-RevId: 398071060
--
8a9a302aebf2419e83f0c7dc5a63c33d26b807a3 by James Y Knight <jyknight@google.com>:
Silence -Wunused-value warning newly emitted by ToT Clang.
The value is being intentionally ignored, as the purpose of the call is only to eliminate this overload via SFINAE when `GenT{}` is not constant evaluable.
PiperOrigin-RevId: 397861294
GitOrigin-RevId: 336f161ad8cb2cc3e1a6bbcbbb8c5b692ee59789
Change-Id: I946e1d22619f92ce6a424c8c13a20a50b39ed463
Diffstat (limited to 'absl/container/btree_map.h')
| -rw-r--r-- | absl/container/btree_map.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/absl/container/btree_map.h b/absl/container/btree_map.h index 6bbf414e..f0a8d4a6 100644 --- a/absl/container/btree_map.h +++ b/absl/container/btree_map.h @@ -693,9 +693,8 @@ class btree_multimap // btree_multimap::merge() // - // Extracts elements from a given `source` btree_multimap into this - // `btree_multimap`. If the destination `btree_multimap` already contains an - // element with an equivalent key, that element is not extracted. + // Extracts all elements from a given `source` btree_multimap into this + // `btree_multimap`. using Base::merge; // btree_multimap::swap(btree_multimap& other) |