aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-25 14:46:22 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-25 14:46:22 +0000
commit56172676c6f108af7daeffb75c7f9d5c792544a1 (patch)
treebd86e9e15659f402ac6e9a2b2e2685065f5774a9 /src
parent5d1e5589fe446a59372debd8c7221170e21ec2b8 (diff)
use namespace instead of static for template params
git-svn-id: http://skia.googlecode.com/svn/trunk@10354 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkScaledImageCache.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/SkScaledImageCache.cpp b/src/core/SkScaledImageCache.cpp
index 147697af4e..8d34dfbcc3 100644
--- a/src/core/SkScaledImageCache.cpp
+++ b/src/core/SkScaledImageCache.cpp
@@ -129,17 +129,19 @@ struct SkScaledImageCache::Rec {
#include "SkTDynamicHash.h"
-static const Key& key_from_rec(const SkScaledImageCache::Rec& rec) {
+namespace { // can't use static functions w/ template parameters
+const Key& key_from_rec(const SkScaledImageCache::Rec& rec) {
return rec.fKey;
}
-static uint32_t hash_from_key(const Key& key) {
+uint32_t hash_from_key(const Key& key) {
return key.fHash;
}
-static bool eq_rec_key(const SkScaledImageCache::Rec& rec, const Key& key) {
+bool eq_rec_key(const SkScaledImageCache::Rec& rec, const Key& key) {
return rec.fKey == key;
}
+}
class SkScaledImageCache::Hash : public SkTDynamicHash<SkScaledImageCache::Rec,
Key, key_from_rec, hash_from_key,