From d41c4d8c732095ae99c955b6b82f7306633004b1 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
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/RenderState.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libs/hwui/RenderState.cpp')

diff --git a/libs/hwui/RenderState.cpp b/libs/hwui/RenderState.cpp
index d1f5f4e0fdd2..45a97fb6f937 100644
--- a/libs/hwui/RenderState.cpp
+++ b/libs/hwui/RenderState.cpp
@@ -23,7 +23,7 @@ namespace uirenderer {
 
 RenderState::RenderState(renderthread::RenderThread& thread)
         : mRenderThread(thread)
-        , mCaches(NULL)
+        , mCaches(nullptr)
         , mViewportWidth(0)
         , mViewportHeight(0)
         , mFramebuffer(0) {
@@ -105,7 +105,7 @@ void RenderState::interruptForFunctorInvoke() {
     if (mCaches->currentProgram) {
         if (mCaches->currentProgram->isInUse()) {
             mCaches->currentProgram->remove();
-            mCaches->currentProgram = NULL;
+            mCaches->currentProgram = nullptr;
         }
     }
     mCaches->resetActiveTexture();
@@ -165,9 +165,9 @@ class DecStrongTask : public renderthread::RenderTask {
 public:
     DecStrongTask(VirtualLightRefBase* object) : mObject(object) {}
 
-    virtual void run() {
-        mObject->decStrong(0);
-        mObject = 0;
+    virtual void run() override {
+        mObject->decStrong(nullptr);
+        mObject = nullptr;
         delete this;
     }
 
-- 
cgit v1.2.3-59-g8ed1b