Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

Browse Source 
* commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
  Fix TinyHashMap to use generic hash_type instead of hash_t
This commit is contained in:
Narayan Kamath
2014-02-11 13:47:50 +00:00
committed by Android Git Automerger
parent 25df673b84 5f7c0b1d80
commit deefd1fdea
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/utils/TinyHashMap.h
View File

@@ -24,8 +24,6 @@ namespace uirenderer {
/** /**
* A very simple hash map that doesn't allow duplicate keys, overwriting the older entry. * A very simple hash map that doesn't allow duplicate keys, overwriting the older entry.
*
* Currently, expects simple keys that are handled by hash_t()
*/ */
template <typename TKey, typename TValue> template <typename TKey, typename TValue>
class TinyHashMap { class TinyHashMap {
@@ -36,7 +34,7 @@ public:
* Puts an entry in the hash, removing any existing entry with the same key * Puts an entry in the hash, removing any existing entry with the same key
*/ */
void put(TKey key, TValue value) { void put(TKey key, TValue value) {
hash_t hash = hash_t(key); hash_t hash = android::hash_type(key);
ssize_t index = mTable.find(-1, hash, key); ssize_t index = mTable.find(-1, hash, key);
if (index != -1) { if (index != -1) {
@@ -51,7 +49,7 @@ public:
* Return true if key is in the map, in which case stores the value in the output ref * Return true if key is in the map, in which case stores the value in the output ref
*/ */
bool get(TKey key, TValue& outValue) { bool get(TKey key, TValue& outValue) {
hash_t hash = hash_t(key); hash_t hash = android::hash_type(key);
ssize_t index = mTable.find(-1, hash, key); ssize_t index = mTable.find(-1, hash, key);
if (index == -1) { if (index == -1) {
return false; return false;