diff options
| -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. |