diff options
| author |  Copybara-Service <copybara-worker@google.com> | 2023-02-21 12:15:56 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-02-21 12:15:56 -0800 |
| commit | e575e989c8117f5f2c6bad75db38c9b1da48e750 (patch) | |
| tree | 33ad667152b6f5dcb3cbfbdceeb99923ef8b3e61 /absl | |
| parent | 7a522a573fbf85f9f1c42dc49a37496e64995f0e (diff) | |
| parent | 8459e11a508162d02000420f3ced5814a5743c08 (diff) | |
Merge pull request #1401 from AtariDreams:apple
PiperOrigin-RevId: 511270860
Change-Id: Ib7de8c72505bf141d450f950074a27f9f4f1613c
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/hash/internal/hash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h index eb50e2c7..89740dab 100644 --- a/absl/hash/internal/hash.h +++ b/absl/hash/internal/hash.h @@ -1136,7 +1136,8 @@ class ABSL_DLL MixingHashState : public HashStateBase<MixingHashState> { // probably per-build and not per-process. ABSL_ATTRIBUTE_ALWAYS_INLINE static uint64_t Seed() { #if (!defined(__clang__) || __clang_major__ > 11) && \ - !defined(__apple_build_version__) + (!defined(__apple_build_version__) || \ + __apple_build_version__ >= 19558921) // Xcode 12 return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(&kSeed)); #else // Workaround the absence of |