Index: memory
===================================================================
--- memory	(revision 192566)
+++ memory	(working copy)
@@ -3174,7 +3174,8 @@
     if (__len > 8) {
       const _Size __a = __loadword<_Size>(__s);
       const _Size __b = __loadword<_Size>(__s + __len - 8);
-      return __hash_len_16(__a, __rotate_by_at_least_1(__b + __len, __len)) ^ __b;
+      return __hash_len_16(__a, __rotate_by_at_least_1(__b + __len, 
+                          static_cast<int>(__len))) ^ __b;
     }
     if (__len >= 4) {
       const uint32_t __a = __loadword<uint32_t>(__s);
@@ -3187,7 +3188,8 @@
       const unsigned char __c = __s[__len - 1];
       const uint32_t __y = static_cast<uint32_t>(__a) +
                            (static_cast<uint32_t>(__b) << 8);
-      const uint32_t __z = __len + (static_cast<uint32_t>(__c) << 2);
+      const uint32_t __z = static_cast<uint32_t>(__len) + 
+                           (static_cast<uint32_t>(__c) << 2);
       return __shift_mix(__y * __k2 ^ __z * __k3) * __k2;
     }
     return __k2;