Merge pull request #4635

6c23b08 CCoinsKeyHasher::operator() should return size_t (Wladimir J. van der Laan)

1 files changed, 4 insertions, 1 deletions

diff --git a/src/coins.h b/src/coins.h
index 9f90fe6bd..ff6028816 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -247,7 +247,10 @@ private:
 
 public:
     CCoinsKeyHasher();
-    uint64_t operator()(const uint256& key) const {
+    // This *must* return size_t. With Boost 1.46 on 32-bit systems the
+    // unordered_map will behave unpredictably if the custom hasher returns a
+    // uint64_t, resulting in failures when syncing the chain (#4634).
+    size_t operator()(const uint256& key) const {
         return key.GetHash(salt);
     }
 };