Skip to content

Use consistent hash across NDEBUG/!NDEBUG builds. #3327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xfxyjwf merged 1 commit into from
Jul 13, 2017
Merged

Use consistent hash across NDEBUG/!NDEBUG builds. #3327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/google/protobuf/map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,14 +862,7 @@ class Map {
size_type BucketNumber(const Key& k) const {
// We inherit from hasher, so one-arg operator() provides a hash function.
size_type h = (*const_cast<InnerMap*>(this))(k);
// To help prevent people from making assumptions about the hash function,
// we use the seed differently depending on NDEBUG. The default hash
// function, the seeding, etc., are all likely to change in the future.
#ifndef NDEBUG
return (h * (seed_ | 1)) & (num_buckets_ - 1);
#else
return (h + seed_) & (num_buckets_ - 1);
#endif
}

bool IsMatch(const Key& k0, const Key& k1) const {
Expand Down