1diff --git a/base/third_party/cityhash_v103/src/city_v103.cc b/base/third_party/cityhash_v103/src/city_v103.cc 2index 1f99751c1a60..3451b6ffec14 100644 3--- a/base/third_party/cityhash_v103/src/city_v103.cc 4+++ b/base/third_party/cityhash_v103/src/city_v103.cc 5@@ -39,8 +39,6 @@ namespace base { 6 namespace internal { 7 namespace cityhash_v103 { 8 9-using namespace std; 10- 11 static uint64 UNALIGNED_LOAD64(const char *p) { 12 uint64 result; 13 memcpy(&result, p, sizeof(result)); 14@@ -158,7 +156,7 @@ static uint64 HashLen17to32(const char *s, size_t len) { 15 16 // Return a 16-byte hash for 48 bytes. Quick and dirty. 17 // Callers do best to use "random-looking" values for a and b. 18-static pair<uint64, uint64> WeakHashLen32WithSeeds( 19+static std::pair<uint64, uint64> WeakHashLen32WithSeeds( 20 uint64 w, uint64 x, uint64 y, uint64 z, uint64 a, uint64 b) { 21 a += w; 22 b = Rotate(b + a + z, 21); 23@@ -166,11 +164,11 @@ static pair<uint64, uint64> WeakHashLen32WithSeeds( 24 a += x; 25 a += y; 26 b += Rotate(a, 44); 27- return make_pair(a + z, b + c); 28+ return std::make_pair(a + z, b + c); 29 } 30 31 // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. 32-static pair<uint64, uint64> WeakHashLen32WithSeeds( 33+static std::pair<uint64, uint64> WeakHashLen32WithSeeds( 34 const char* s, uint64 a, uint64 b) { 35 return WeakHashLen32WithSeeds(Fetch64(s), 36 Fetch64(s + 8), 37@@ -220,8 +218,8 @@ uint64 CityHash64(const char *s, size_t len) { 38 uint64 x = Fetch64(s + len - 40); 39 uint64 y = Fetch64(s + len - 16) + Fetch64(s + len - 56); 40 uint64 z = HashLen16(Fetch64(s + len - 48) + len, Fetch64(s + len - 24)); 41- pair<uint64, uint64> v = WeakHashLen32WithSeeds(s + len - 64, len, z); 42- pair<uint64, uint64> w = WeakHashLen32WithSeeds(s + len - 32, y + k1, x); 43+ std::pair<uint64, uint64> v = WeakHashLen32WithSeeds(s + len - 64, len, z); 44+ std::pair<uint64, uint64> w = WeakHashLen32WithSeeds(s + len - 32, y + k1, x); 45 x = x * k1 + Fetch64(s); 46 47 // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks. 48@@ -290,7 +288,7 @@ uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed) { 49 50 // We expect len >= 128 to be the common case. Keep 56 bytes of state: 51 // v, w, x, y, and z. 52- pair<uint64, uint64> v, w; 53+ std::pair<uint64, uint64> v, w; 54 uint64 x = Uint128Low64(seed); 55 uint64 y = Uint128High64(seed); 56 uint64 z = len * k1; 57@@ -349,7 +347,7 @@ uint128 CityHash128(const char *s, size_t len) { 58 uint128(Fetch64(s) ^ k3, 59 Fetch64(s + 8))); 60 } else if (len >= 8) { 61- return CityHash128WithSeed(NULL, 62+ return CityHash128WithSeed(nullptr, 63 0, 64 uint128(Fetch64(s) ^ (len * k0), 65 Fetch64(s + len - 8) ^ k1)); 66