summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-01-06 00:50:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-01-06 00:50:53 +0000
commitb15f21effb8d5be988bb46eea00b6ff28222aa98 (patch)
tree1e972cc58de13661c5db8bf76d3b8d860a0bcfb4 /libs/hwui/ProgramCache.cpp
parent578efef682cc2216db121bb88d2af977703ee6e2 (diff)
parentd41c4d8c732095ae99c955b6b82f7306633004b1 (diff)
Merge "Add overrides and switch to nullptr keyword for all files"
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
-rw-r--r--libs/hwui/ProgramCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index 6d3f0cbc1af3..3bbd520b44fe 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -429,7 +429,7 @@ Program* ProgramCache::get(const ProgramDescription& description) {
}
auto iter = mCache.find(key);
- Program* program = NULL;
+ Program* program = nullptr;
if (iter == mCache.end()) {
description.log("Could not find program");
program = generateProgram(description, key);