Merge "use std::hash instead of hashing byte by byte"

am: aaa0bbce8e

Change-Id: Iee321900f8ef386cd118d874c31c5b0d2741551a
This commit is contained in:
Elliott Hughes 2017-11-30 23:25:55 +00:00 committed by android-build-merger
commit bfb96796a4
1 changed files with 6 additions and 0 deletions

View File

@ -100,6 +100,11 @@ static uint32_t RoundUpPower2(uint32_t val) {
}
static uint32_t ComputeHash(const ZipString& name) {
#if !defined(_WIN32)
return std::hash<std::string_view>{}(
std::string_view(reinterpret_cast<const char*>(name.name), name.name_length));
#else
// Remove this code path once the windows compiler knows how to compile the above statement.
uint32_t hash = 0;
uint16_t len = name.name_length;
const uint8_t* str = name.name;
@ -109,6 +114,7 @@ static uint32_t ComputeHash(const ZipString& name) {
}
return hash;
#endif
}
/*