diff options
| author |  Abseil Team <absl-team@google.com> | 2020-06-17 14:16:51 -0700 |
|---|---|---|
| committer |  Andy Getz <durandal@google.com> | 2020-06-18 16:10:44 -0400 |
| commit | 4ccc0fce09836a25b474f4b1453146dae2c29f4d (patch) | |
| tree | eb4e2c17bd7a605337192b21af4e9fe694b6e429 /absl/container/internal/btree.h | |
| parent | 4a851046a0102cd986a5714a1af8deef28a544c4 (diff) | |
Export of internal Abseil changes
--
34c0d521b11ed4191ea3e071a864a84e5e5941b7 by Matthew Brown <matthewbr@google.com>:
Release absl::StrFormat custom type extensions
- Allows StrFormat methods to be extended to accept types which implement
AbslFormatConvert()
- NOLINTNEXTLINE(readability-redundant-declaration) used, declarations are
required in some compilers.
PiperOrigin-RevId: 316963065
--
4d475b5ad02d41057447d722ad35573fc4f48d1f by Evan Brown <ezb@google.com>:
Small fix to previous change: the first overload of insert_iterator_unique wasn't actually being selected. Fix that issue and add tests to verify that it actually works.
Note: couldn't use TestInstanceTracker here because that counts instances (and decrements in destructor) rather than counting all constructor calls.
PiperOrigin-RevId: 316927690
GitOrigin-RevId: 34c0d521b11ed4191ea3e071a864a84e5e5941b7
Change-Id: If8bbb8317b93af4084ac4cc55b752b99b1581b58
Diffstat (limited to 'absl/container/internal/btree.h')
| -rw-r--r-- | absl/container/internal/btree.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h index 9fe1b27f..996afa61 100644 --- a/absl/container/internal/btree.h +++ b/absl/container/internal/btree.h @@ -1208,9 +1208,9 @@ class btree { // Note: the first overload avoids constructing a value_type if the key // already exists in the btree. template <typename InputIterator, - typename = decltype( - compare_keys(params_type::key(*std::declval<InputIterator>()), - std::declval<const key_type &>()))> + typename = decltype(std::declval<const key_compare &>()( + params_type::key(*std::declval<InputIterator>()), + std::declval<const key_type &>()))> void insert_iterator_unique(InputIterator b, InputIterator e, int); // We need the second overload for cases in which we need to construct a // value_type in order to compare it with the keys already in the btree. |