diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/PathCache.cpp | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
| download | frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.zip frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.tar.gz frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.tar.bz2 | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/PathCache.cpp')
| -rw-r--r-- | libs/hwui/PathCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index 80f9c2f..37d70f2 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -196,7 +196,7 @@ void PathCache::setMaxSize(uint32_t maxSize) { // Callbacks /////////////////////////////////////////////////////////////////////////////// -void PathCache::operator()(PathDescription& entry, PathTexture*& texture) { +void PathCache::operator()(PathDescription& /* entry */, PathTexture*& texture) { removeTexture(texture); } |