diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-07 21:10:39 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-07 21:10:39 +0000 |
| commit | cf385232c45b7692eaf31260fe650457f400521a (patch) | |
| tree | c662087d1857f30aa5f449299daed55f98dc0ea3 /include | |
| parent | a12cc7fda00236549961d7b8e2d708cfe3cfa4e6 (diff) | |
Don't let templates live in shadows.
git-svn-id: http://skia.googlecode.com/svn/trunk@2434 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkTArray.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h index 383657bbfa..48f32d2c4a 100644 --- a/include/core/SkTArray.h +++ b/include/core/SkTArray.h @@ -358,11 +358,11 @@ private: } } - template<typename T> friend void SkTArrayExt::copy(SkTArray<T, true>* that, const T*); - template<typename T> friend void SkTArrayExt::copyAndDelete(SkTArray<T, true>* that, char*); + template<typename X> friend void SkTArrayExt::copy(SkTArray<X, true>* that, const X*); + template<typename X> friend void SkTArrayExt::copyAndDelete(SkTArray<X, true>* that, char*); - template<typename T> friend void SkTArrayExt::copy(SkTArray<T, false>* that, const T*); - template<typename T> friend void SkTArrayExt::copyAndDelete(SkTArray<T, false>* that, char*); + template<typename X> friend void SkTArrayExt::copy(SkTArray<X, false>* that, const X*); + template<typename X> friend void SkTArrayExt::copyAndDelete(SkTArray<X, false>* that, char*); int fReserveCount; int fCount; |