diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 21:29:39 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:55:19 +0100 |
| commit | d67849366c6c6af8aa96afd9503cdd028afd2db1 (patch) | |
| tree | b02cec3d28dec099b9ab2fa25b97fdedeaba394a /base | |
| parent | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (diff) | |
| download | external_chromium-d67849366c6c6af8aa96afd9503cdd028afd2db1.zip external_chromium-d67849366c6c6af8aa96afd9503cdd028afd2db1.tar.gz external_chromium-d67849366c6c6af8aa96afd9503cdd028afd2db1.tar.bz2 | |
Merge Chromium at 10.0.621.0: Fix conflict in hash_tables.h
Spelling error correction at the same place as our local change
http://codereview.chromium.org/5185001
Change-Id: I3b4e81dd4bf76ea0c6d0a399df549fcccf084035
Diffstat (limited to 'base')
| -rw-r--r-- | base/hash_tables.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/hash_tables.h b/base/hash_tables.h index d11e19f..90c33aa 100644 --- a/base/hash_tables.h +++ b/base/hash_tables.h @@ -58,14 +58,10 @@ using __gnu_cxx::hash_set; namespace __gnu_cxx { -<<<<<<< HEAD #ifndef ANDROID // Already defined for android -// The GNU C++ library provides identiy hash functions for many integral types, -======= // The GNU C++ library provides identity hash functions for many integral types, ->>>>>>> chromium.org at r10.0.621.0 // but not for |long long|. This hash function will truncate if |size_t| is // narrower than |long long|. This is probably good enough for what we will // use it for. |