From e84a208317e0ed388fcdad1e6743c7849acb51b0 Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Mon, 22 Dec 2014 14:28:49 -0800
Subject: Add overrides and switch to nullptr keyword

Changes generated with clang-modernize.

Additionally, fixed some struct-vs-class usage to make clang happy.

Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
---
 libs/hwui/CanvasState.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/hwui/CanvasState.h')

diff --git a/libs/hwui/CanvasState.h b/libs/hwui/CanvasState.h
index 6883d0a4bc55..9e6a9c3cf63b 100644
--- a/libs/hwui/CanvasState.h
+++ b/libs/hwui/CanvasState.h
@@ -161,7 +161,7 @@ public:
     int getHeight() { return mHeight; }
 
     inline const Snapshot* currentSnapshot() const {
-        return mSnapshot != NULL ? mSnapshot.get() : mFirstSnapshot.get();
+        return mSnapshot != nullptr ? mSnapshot.get() : mFirstSnapshot.get();
     }
     inline Snapshot* writableSnapshot() { return mSnapshot.get(); }
     inline const Snapshot* firstSnapshot() const { return mFirstSnapshot.get(); }
-- 
cgit v1.2.3-59-g8ed1b