• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/base/third_party/cityhash_v103/src/city_v103.cc b/base/third_party/cityhash_v103/src/city_v103.cc
2index 8248068209cf..1f99751c1a60 100644
3--- a/base/third_party/cityhash_v103/src/city_v103.cc
4+++ b/base/third_party/cityhash_v103/src/city_v103.cc
5@@ -32,6 +32,13 @@
6 #include <algorithm>
7 #include <string.h>  // for memcpy and memset
8
9+#include "base/compiler_specific.h"
10+#include "build/build_config.h"
11+
12+namespace base {
13+namespace internal {
14+namespace cityhash_v103 {
15+
16 using namespace std;
17
18 static uint64 UNALIGNED_LOAD64(const char *p) {
19@@ -46,7 +53,7 @@ static uint32 UNALIGNED_LOAD32(const char *p) {
20   return result;
21 }
22
23-#if !defined(WORDS_BIGENDIAN)
24+#if defined(ARCH_CPU_LITTLE_ENDIAN)
25
26 #define uint32_in_expected_order(x) (x)
27 #define uint64_in_expected_order(x) (x)
28@@ -71,7 +78,7 @@ static uint32 UNALIGNED_LOAD32(const char *p) {
29 #define uint32_in_expected_order(x) (bswap_32(x))
30 #define uint64_in_expected_order(x) (bswap_64(x))
31
32-#endif  // WORDS_BIGENDIAN
33+#endif  // defined(ARCH_CPU_LITTLE_ENDIAN)
34
35 #if !defined(LIKELY)
36 #if HAVE_BUILTIN_EXPECT
37@@ -350,3 +357,7 @@ uint128 CityHash128(const char *s, size_t len) {
38     return CityHash128WithSeed(s, len, uint128(k0, k1));
39   }
40 }
41+
42+}  // namespace cityhash_v103
43+}  // namespace internal
44+}  // namespace base
45diff --git a/base/third_party/cityhash_v103/src/city_v103.h b/base/third_party/cityhash_v103/src/city_v103.h
46index 7a827fbea4ff..3828a78feb54 100644
47--- a/base/third_party/cityhash_v103/src/city_v103.h
48+++ b/base/third_party/cityhash_v103/src/city_v103.h
49@@ -47,6 +47,10 @@
50 #include <stdint.h>
51 #include <utility>
52
53+namespace base {
54+namespace internal {
55+namespace cityhash_v103 {
56+
57 typedef uint8_t uint8;
58 typedef uint32_t uint32;
59 typedef uint64_t uint64;
60@@ -87,4 +91,8 @@ inline uint64 Hash128to64(const uint128& x) {
61   return b;
62 }
63
64+}  // namespace cityhash_v103
65+}  // namespace internal
66+}  // namespace base
67+
68 #endif  // BASE_THIRD_PARTY_CITYHASH_V103_SRC_CITY_V103_H_
69