Skip to content

Commit

Permalink
folly: hash: specialize hash_combine_generic by size_t size
Browse files Browse the repository at this point in the history
Reviewed By: yangliu

Differential Revision: D2578043

fb-gh-sync-id: cec8f21219655a495b99d0b6b99f0925615bc068
  • Loading branch information
luciang authored and facebook-github-bot-4 committed Oct 26, 2015
1 parent fa9cc99 commit 59527d6
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions folly/Hash.h
Expand Up @@ -17,11 +17,12 @@
#ifndef FOLLY_BASE_HASH_H_
#define FOLLY_BASE_HASH_H_

#include <cstdint>
#include <cstring>
#include <stdint.h>
#include <string>
#include <utility>
#include <tuple>
#include <type_traits>
#include <utility>

#include <folly/ApplyTuple.h>
#include <folly/SpookyHashV1.h>
Expand Down Expand Up @@ -73,14 +74,20 @@ uint64_t hash_range(Iter begin,
return hash;
}

inline uint32_t twang_32from64(uint64_t key);

template <class Hasher, typename T, typename... Ts>
size_t hash_combine_generic(const T& t, const Ts&... ts) {
size_t seed = Hasher::hash(t);
if (sizeof...(ts) == 0) {
return seed;
}
size_t remainder = hash_combine_generic<Hasher>(ts...);
return hash_128_to_64(seed, remainder);
/* static */ if (sizeof(size_t) == sizeof(uint32_t)) {
return twang_32from64((uint64_t(seed) << 32) | remainder);
} else {
return static_cast<size_t>(hash_128_to_64(seed, remainder));
}
}

// Simply uses std::hash to hash. Note that std::hash is not guaranteed
Expand Down Expand Up @@ -368,19 +375,20 @@ template<> struct hasher<uint32_t> {

template<> struct hasher<int64_t> {
size_t operator()(int64_t key) const {
return hash::twang_mix64(uint64_t(key));
return static_cast<size_t>(hash::twang_mix64(uint64_t(key)));
}
};

template<> struct hasher<uint64_t> {
size_t operator()(uint64_t key) const {
return hash::twang_mix64(key);
return static_cast<size_t>(hash::twang_mix64(key));
}
};

template<> struct hasher<std::string> {
size_t operator()(const std::string& key) const {
return hash::SpookyHashV2::Hash64(key.data(), key.size(), 0);
return static_cast<size_t>(
hash::SpookyHashV2::Hash64(key.data(), key.size(), 0));
}
};

Expand Down

0 comments on commit 59527d6

Please sign in to comment.