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/AssetAtlas.h | |
| parent | 07adacf4996c8ca494332ec938786fa15832c722 (diff) | |
| download | frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.zip frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.tar.gz frameworks_base-e84a208317e0ed388fcdad1e6743c7849acb51b0.tar.bz2 | |
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/AssetAtlas.h')
| -rw-r--r-- | libs/hwui/AssetAtlas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AssetAtlas.h b/libs/hwui/AssetAtlas.h index dba9e62..1772eff 100644 --- a/libs/hwui/AssetAtlas.h +++ b/libs/hwui/AssetAtlas.h @@ -106,7 +106,7 @@ public: friend class AssetAtlas; }; - AssetAtlas(): mTexture(NULL), mImage(NULL), + AssetAtlas(): mTexture(nullptr), mImage(nullptr), mBlendKey(true), mOpaqueKey(false) { } ~AssetAtlas() { terminate(); } |