diff options
| author |  Abseil Team <absl-team@google.com> | 2019-01-10 12:35:16 -0800 |
|---|---|---|
| committer |  Shaindel Schwartz <shaindel@google.com> | 2019-01-10 16:10:30 -0500 |
| commit | 66f9becbb98ecc083f4db349b4b1e0ca9de93b15 (patch) | |
| tree | e7b025f478620b8fd6508a903847a0f9d7f94ebf | |
| parent | 018b4db1d73ec8238e6dc4b17fd9e1fd7468d0ed (diff) | |
Export of internal Abseil changes.
--
da7b6d9d43b2951a3487bbfd41aa2ee96b2813ef by Derek Mauro <dmauro@google.com>:
Internal change
PiperOrigin-RevId: 228757155
--
2789fc170bed4b671a01a4106e3ba5059ff225fb by CJ Johnson <johnsoncj@google.com>:
`Other<X>` => `The<X>` for AbslHashValue of InlinedVector
PiperOrigin-RevId: 228558678
GitOrigin-RevId: da7b6d9d43b2951a3487bbfd41aa2ee96b2813ef
Change-Id: Iaeb33ae791f093d94ad9f893b3455d5403429089
| -rw-r--r-- | absl/container/inlined_vector.h | 12 | ||||
| -rw-r--r-- | absl/debugging/symbolize_unimplemented.inc | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index b6063441..c2f9d44b 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -799,8 +799,8 @@ class InlinedVector { } private: - template <typename Hash, typename OtherT, size_t OtherN, typename OtherA> - friend Hash AbslHashValue(Hash, const InlinedVector<OtherT, OtherN, OtherA>&); + template <typename Hash, typename TheT, size_t TheN, typename TheA> + friend Hash AbslHashValue(Hash, const InlinedVector<TheT, TheN, TheA>& vec); // Holds whether the vector is allocated or not in the lowest bit and the size // in the high bits: @@ -1339,10 +1339,10 @@ bool operator>=(const InlinedVector<T, N, A>& a, return !(a < b); } -template <typename Hash, typename T, size_t N, typename A> -Hash AbslHashValue(Hash hash, const InlinedVector<T, N, A>& inlined_vector) { - auto p = inlined_vector.data(); - auto n = inlined_vector.size(); +template <typename Hash, typename TheT, size_t TheN, typename TheA> +Hash AbslHashValue(Hash hash, const InlinedVector<TheT, TheN, TheA>& vec) { + auto p = vec.data(); + auto n = vec.size(); return Hash::combine(Hash::combine_contiguous(std::move(hash), p, n), n); } diff --git a/absl/debugging/symbolize_unimplemented.inc b/absl/debugging/symbolize_unimplemented.inc index 2a3f4acb..98b3a9ae 100644 --- a/absl/debugging/symbolize_unimplemented.inc +++ b/absl/debugging/symbolize_unimplemented.inc @@ -26,6 +26,9 @@ bool RemoveAllSymbolDecorators(void) { return false; } bool RegisterFileMappingHint(const void *, const void *, uint64_t, const char *) { return false; } +bool GetFileMappingHint(const void **, const void **, uint64_t *, const char **) { + return false; +} } // namespace debugging_internal |