Use bit_xor, use default offset in shift_left.

evoskuil · evoskuil · commit 3450a1f79e6d · 2025-03-19T16:27:12.000-04:00
diff --git a/include/bitcoin/system/impl/hash/functions.ipp b/include/bitcoin/system/impl/hash/functions.ipp
@@ -236,7 +236,6 @@ INLINE constexpr size_t djb2_hash(const data_slice& data) NOEXCEPT
     return hash;
 }
 
-// Formerly: return left ^ shift_left(right, one);
 // Combine hash values, such as djb2_hash or unique_hash outputs.
 INLINE constexpr size_t hash_combine(size_t left, size_t right) NOEXCEPT
 {
@@ -262,7 +261,7 @@ INLINE constexpr size_t hash_combine(size_t left, size_t right) NOEXCEPT
     ////first ^= shift_right(first, 29);
 
     ////return first;
-    return left ^ shift_left(right, one);
+    return bit_xor(left, shift_left(right));
 }
 
 } // namespace system

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ INLINE constexpr size_t djb2_hash(const data_slice& data) NOEXCEPT`
`236`	`236`	`return hash;`
`237`	`237`	`}`
`238`	`238`
`239`		`-// Formerly: return left ^ shift_left(right, one);`
`240`	`239`	`// Combine hash values, such as djb2_hash or unique_hash outputs.`
`241`	`240`	`INLINE constexpr size_t hash_combine(size_t left, size_t right) NOEXCEPT`
`242`	`241`	`{`
`@@ -262,7 +261,7 @@ INLINE constexpr size_t hash_combine(size_t left, size_t right) NOEXCEPT`
`262`	`261`	`////first ^= shift_right(first, 29);`
`263`	`262`
`264`	`263`	`////return first;`
`265`		`- return left ^ shift_left(right, one);`
	`264`	`+ return bit_xor(left, shift_left(right));`
`266`	`265`	`}`
`267`	`266`
`268`	`267`	`} // namespace system`