aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleLua.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /samplecode/SampleLua.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'samplecode/SampleLua.cpp')
-rw-r--r--samplecode/SampleLua.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp
index f21c7de5d8..8865f1a153 100644
--- a/samplecode/SampleLua.cpp
+++ b/samplecode/SampleLua.cpp
@@ -75,7 +75,7 @@ public:
}
protected:
- bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) override {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Lua");
return true;
@@ -101,7 +101,7 @@ protected:
return this->INHERITED::onQuery(evt);
}
- void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) override {
lua_State* L = this->ensureLua();
lua_getglobal(L, gDrawName);
@@ -126,7 +126,7 @@ protected:
}
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
- unsigned modi) SK_OVERRIDE {
+ unsigned modi) override {
lua_State* L = this->ensureLua();
lua_getglobal(L, gClickName);
if (lua_isfunction(L, -1)) {
@@ -147,7 +147,7 @@ protected:
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) override {
if (click->getType() != gLuaClickHandlerName) {
return this->INHERITED::onClick(click);
}