diff options
| author | 2014-12-22 14:28:49 -0800 | |
|---|---|---|
| committer | 2014-12-22 14:56:08 -0800 | |
| commit | e84a208317e0ed388fcdad1e6743c7849acb51b0 (patch) | |
| tree | 8c057e6b6367a85790c30a118e6c8789c6bdf538 /libs/hwui/CanvasState.h | |
| parent | 07adacf4996c8ca494332ec938786fa15832c722 (diff) | |
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
Diffstat (limited to 'libs/hwui/CanvasState.h')
| -rw-r--r-- | libs/hwui/CanvasState.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |