From d41c4d8c732095ae99c955b6b82f7306633004b1 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 5 Jan 2015 15:51:13 -0800 Subject: Add overrides and switch to nullptr keyword for all files Adds remaining missing overrides and nullptr usages, missed due to an extreme failure in tool usage. Change-Id: I56abd72975a3999ad13330003c348db40f59aebf --- libs/hwui/tests/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/hwui/tests') diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp index 4efef6f..152e7b2 100644 --- a/libs/hwui/tests/main.cpp +++ b/libs/hwui/tests/main.cpp @@ -33,7 +33,7 @@ using namespace android::uirenderer::renderthread; class ContextFactory : public IContextFactory { public: - virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) { + virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) override { return new AnimationContext(clock); } }; @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { sp surface = control->getSurface(); RenderNode* rootNode = new RenderNode(); - rootNode->incStrong(0); + rootNode->incStrong(nullptr); rootNode->mutateStagingProperties().setLeftTopRightBottom(0, 0, width, height); rootNode->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y); rootNode->mutateStagingProperties().setClipToBounds(false); @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) { sleep(5); - rootNode->decStrong(0); + rootNode->decStrong(nullptr); printf("Success!\n"); return 0; -- cgit v1.1