aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2014-09-18 11:00:40 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-18 11:00:40 -0700
commita10742c69ce47d346e3cf23e7be909c9f29b401e (patch)
tree0855675b6829d526c19481ccbeef537aa9d237e4 /include/views
parent95b7144adffc376e62c50c6d5010a3880dec61fa (diff)
update to accommodate latest clang in chrome toolchain
remove asserts for null pointers to references change var args signature to pointer instead of array R=mtklein@google.com, reed@android.com, reed@google.com, mtklein, reed Author: caryclark@google.com Review URL: https://codereview.chromium.org/577243002
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkOSMenu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/views/SkOSMenu.h b/include/views/SkOSMenu.h
index 8801a52f50..73254187ef 100644
--- a/include/views/SkOSMenu.h
+++ b/include/views/SkOSMenu.h
@@ -129,7 +129,7 @@ public:
*/
int appendAction(const char label[], SkEventSinkID target);
int appendList(const char label[], const char slotName[],
- SkEventSinkID target, int defaultIndex, const char[] ...);
+ SkEventSinkID target, int defaultIndex, const char* ...);
int appendSlider(const char label[], const char slotName[],
SkEventSinkID target, SkScalar min, SkScalar max,
SkScalar defaultValue);