diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /libs/hwui/TessellationCache.h | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb (diff) | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf (diff) | |
| download | frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.zip frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.gz frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.bz2 | |
resolved conflicts for merge of 220c3f4f to master
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
Diffstat (limited to 'libs/hwui/TessellationCache.h')
| -rw-r--r-- | libs/hwui/TessellationCache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/TessellationCache.h b/libs/hwui/TessellationCache.h index a7c50eb..7aaa41e 100644 --- a/libs/hwui/TessellationCache.h +++ b/libs/hwui/TessellationCache.h @@ -178,7 +178,8 @@ private: // holds a pointer, and implicit strong ref to each shadow task of the frame LruCache<ShadowDescription, Task<vertexBuffer_pair_t*>*> mShadowCache; class BufferPairRemovedListener : public OnEntryRemoved<ShadowDescription, Task<vertexBuffer_pair_t*>*> { - void operator()(ShadowDescription& description, Task<vertexBuffer_pair_t*>*& bufferPairTask) { + void operator()(ShadowDescription& /* description */, + Task<vertexBuffer_pair_t*>*& bufferPairTask) { bufferPairTask->decStrong(NULL); } }; |