Merge "use std::hash instead of hashing byte by byte"
am: aaa0bbce8e
Change-Id: Iee321900f8ef386cd118d874c31c5b0d2741551a
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 91e775f..5ccbcc2 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -100,6 +100,11 @@
}
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 @@
}
return hash;
+#endif
}
/*