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/Caches.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/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 4b8b626..2c7a88f 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -386,13 +386,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'; |