Index: tests/DynamicHashTest.cpp |
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp |
index bb9367b46df5c4d0a23000341c61a68c529afe81..b2da6f388883ac9d00792e72173f39e222a267b0 100644 |
--- a/tests/DynamicHashTest.cpp |
+++ b/tests/DynamicHashTest.cpp |
@@ -13,12 +13,13 @@ namespace { |
struct Entry { |
int key; |
double value; |
+ |
+ static const int& GetKey(const Entry& entry) { return entry.key; } |
+ static uint32_t Hash(const int& key) { return key; } |
}; |
-const int& GetKey(const Entry& entry) { return entry.key; } |
-uint32_t GetHash(const int& key) { return key; } |
-class Hash : public SkTDynamicHash<Entry, int, GetKey, GetHash> { |
+class Hash : public SkTDynamicHash<Entry, int> { |
public: |
Hash() : INHERITED() {} |
@@ -27,7 +28,7 @@ public: |
int countCollisions(const int& key) const { return this->INHERITED::countCollisions(key); } |
private: |
- typedef SkTDynamicHash<Entry, int, GetKey, GetHash> INHERITED; |
+ typedef SkTDynamicHash<Entry, int> INHERITED; |
}; |
} // namespace |