diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-14 14:01:31 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-14 14:01:31 +0000 |
| commit | 5c6ae60a713a2befec9c26c4058640320ac0d85e (patch) | |
| tree | 5be2ae54ef1e7f8eed39ca147ad4caae3bc07929 /include/core/SkTArray.h | |
| parent | 49313f6b4391d0f74ab1964c295634e8830680f6 (diff) | |
Fix compilation error related to using nonexistent sk_malloc instead of sk_malloc_throw. VC++ lazy template code compilation let this work on windows since the wrong function name was only in currently unused templated functions.
git-svn-id: http://skia.googlecode.com/svn/trunk@2266 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkTArray.h')
| -rw-r--r-- | include/core/SkTArray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h index 7d74b6ae31..975aeed639 100644 --- a/include/core/SkTArray.h +++ b/include/core/SkTArray.h @@ -85,7 +85,7 @@ public: fCount = array.count(); fReserveCount = gMIN_ALLOC_COUNT; fAllocCount = SkMax32(fReserveCount, fCount); - fMemArray = sk_malloc(sizeof(T) * fAllocCount); + fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount); fPreAllocMemArray = NULL; if (DATA_TYPE) { @@ -107,7 +107,7 @@ public: fCount = count; fReserveCount = gMIN_ALLOC_COUNT; fAllocCount = SkMax32(fReserveCount, fCount); - fMemArray = sk_malloc(sizeof(T) * fAllocCount); + fMemArray = sk_malloc_throw(sizeof(T) * fAllocCount); fPreAllocMemArray = NULL; if (DATA_TYPE) { memcpy(fMemArray, array, sizeof(T) * fCount); |