From e84a208317e0ed388fcdad1e6743c7849acb51b0 Mon Sep 17 00:00:00 2001 From: Chris Craik 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/GradientCache.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/hwui/GradientCache.h') diff --git a/libs/hwui/GradientCache.h b/libs/hwui/GradientCache.h index c94b6f0e1d01..ef4e0cd72873 100644 --- a/libs/hwui/GradientCache.h +++ b/libs/hwui/GradientCache.h @@ -33,8 +33,8 @@ class Texture; struct GradientCacheEntry { GradientCacheEntry() { count = 0; - colors = NULL; - positions = NULL; + colors = nullptr; + positions = nullptr; } GradientCacheEntry(uint32_t* colors, float* positions, uint32_t count) { @@ -118,7 +118,7 @@ public: * Used as a callback when an entry is removed from the cache. * Do not invoke directly. */ - void operator()(GradientCacheEntry& shader, Texture*& texture); + void operator()(GradientCacheEntry& shader, Texture*& texture) override; /** * Returns the texture associated with the specified shader. -- cgit v1.2.3-59-g8ed1b