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/Caches.h | |
| 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/Caches.h')
| -rw-r--r-- | libs/hwui/Caches.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index e338686..d3266f7 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -384,13 +384,13 @@ private: bool bindIndicesBufferInternal(const GLuint buffer); - static void eventMarkNull(GLsizei length, const GLchar* marker) { } - static void startMarkNull(GLsizei length, const GLchar* marker) { } + static void eventMarkNull(GLsizei /* length */, const GLchar* /* marker */) { } + static void startMarkNull(GLsizei /* length */, const GLchar* /* marker */) { } static void endMarkNull() { } - static void setLabelNull(GLenum type, uint object, GLsizei length, - const char* label) { } - static void getLabelNull(GLenum type, uint object, GLsizei bufferSize, + static void setLabelNull(GLenum /* type */, uint /* object */, GLsizei /* length */, + const char* /* label */) { } + static void getLabelNull(GLenum /* type */, uint /* object */, GLsizei /* bufferSize */, GLsizei* length, char* label) { if (length) *length = 0; if (label) *label = '\0'; |