sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified the hash helper so that it's purely based on string views

Browse source
This commit is contained in:
paulfd 2019-08-30 10:26:13 +02:00
parent 857818f45b
commit b36ed23f6e
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sources/Helpers.h
View file

@ -22,11 +22,11 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once #pragma once
#include <bits/stdint-uintn.h>
#include <cstdint> #include <cstdint>
#include <random> #include <random>
#include <signal.h> #include <signal.h>
#include <string_view> #include <string_view>
#ifdef HAVE_X86INTRIN_H #ifdef HAVE_X86INTRIN_H
#include <x86intrin.h> #include <x86intrin.h>
#endif #endif
@ -60,17 +60,13 @@ inline std::string_view trim(std::string_view s)
return s; return s;
} }
inline constexpr unsigned int Fnv1aBasis = 0x811C9DC5; inline constexpr uint64_t Fnv1aBasis = 0x811C9DC5;
inline constexpr unsigned int Fnv1aPrime = 0x01000193; inline constexpr uint64_t Fnv1aPrime = 0x01000193;
inline constexpr unsigned int hash(const char* s, unsigned int h = Fnv1aBasis)
{
return !*s ? h : hash(s + 1, static_cast<unsigned int>((h ^ *s) * static_cast<unsigned long long>(Fnv1aPrime)));
}
inline unsigned int hash(std::string_view s, unsigned int h = Fnv1aBasis) inline constexpr uint64_t hash(std::string_view s, uint64_t h = Fnv1aBasis)
{ {
if (s.length() > 0) if (s.length() > 0)
return hash(std::string_view(s.data() + 1, s.length() - 1), static_cast<unsigned int>((h ^ s.front()) * static_cast<unsigned long long>(Fnv1aPrime))); return hash( { s.data() + 1, s.length() - 1 }, (h ^ s.front()) * Fnv1aPrime );
return h; return h;
} }