diff options
| -rw-r--r-- | absl/container/inlined_vector.h | 14 | ||||
| -rw-r--r-- | absl/synchronization/mutex.cc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 4849f7ea..649e904a 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -808,8 +808,8 @@ class InlinedVector { } private: - template <typename Hash, typename TheT, size_t TheN, typename TheA> - friend Hash AbslHashValue(Hash, const InlinedVector<TheT, TheN, TheA>& vec); + template <typename H, typename TheT, size_t TheN, typename TheA> + friend H AbslHashValue(H, const InlinedVector<TheT, TheN, TheA>& vector); // Holds whether the vector is allocated or not in the lowest bit and the size // in the high bits: @@ -1358,11 +1358,11 @@ bool operator>=(const InlinedVector<T, N, A>& a, // // Provides `absl::Hash` support for inlined vectors. You do not normally call // this function directly. -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); +template <typename H, typename TheT, size_t TheN, typename TheA> +H AbslHashValue(H hash, const InlinedVector<TheT, TheN, TheA>& vector) { + auto p = vector.data(); + auto n = vector.size(); + return H::combine(H::combine_contiguous(std::move(hash), p, n), n); } // ----------------------------------------------------------------------------- diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index f1b42db1..40ab7d22 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -1841,7 +1841,7 @@ static void CheckForMutexCorruption(intptr_t v, const char* label) { // Test for either of two situations that should not occur in v: // kMuWriter and kMuReader // kMuWrWait and !kMuWait - const intptr_t w = v ^ kMuWait; + const uintptr_t w = v ^ kMuWait; // By flipping that bit, we can now test for: // kMuWriter and kMuReader in w // kMuWrWait and kMuWait in w |