diff options
| author | Chris Craik <ccraik@google.com> | 2014-12-22 14:28:49 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-12-22 14:56:08 -0800 |
| commit | e84a208317e0ed388fcdad1e6743c7849acb51b0 (patch) | |
| tree | 8c057e6b6367a85790c30a118e6c8789c6bdf538 /libs/hwui/GradientCache.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/GradientCache.h')
| -rw-r--r-- | libs/hwui/GradientCache.h | 6 |
1 files changed, 3 insertions, 3 deletions
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. |