aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-07-13 20:05:16 -0700
committerGitHub <noreply@github.com>2023-07-13 20:05:16 -0700
commit520594e5296b09205e55bc018b1f759df5725e96 (patch)
tree07e334684062151c5fdf699e805d9326255a3dc3 /libraries
parent8d7dcdfc5b2a231a1304878e25929e6f4ff4e338 (diff)
parent94d4d12ee0a12572b2b661003f10cfbdda1b434a (diff)
downloadPrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.gz
PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.bz2
PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.zip
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/murmur2/src/MurmurHash2.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libraries/murmur2/src/MurmurHash2.cpp b/libraries/murmur2/src/MurmurHash2.cpp
index c13608f0..e7312795 100644
--- a/libraries/murmur2/src/MurmurHash2.cpp
+++ b/libraries/murmur2/src/MurmurHash2.cpp
@@ -89,8 +89,10 @@ void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev)
switch (prev.len) {
case 3:
prev.h ^= data[2] << 16;
+ /* fall through */
case 2:
prev.h ^= data[1] << 8;
+ /* fall through */
case 1:
prev.h ^= data[0];
prev.h *= m;