diff options
author | 2014-11-21 14:19:06 -0800 | |
---|---|---|
committer | 2014-11-21 14:19:06 -0800 | |
commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/TessellationCache.h | |
parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
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 688a69959a57..a05c69025c70 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); } }; |