diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-08-12 13:51:10 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-20 18:14:27 -0700 |
| commit | 44bef6fba6244292b751387f3d6c31cca96c28ad (patch) | |
| tree | a9dd48535a1f3343315bc75f7751cf042c05dc67 /rsScriptIntrinsic.cpp | |
| parent | 4bb773ef75eeff5960852b733bcca5834020ee9e (diff) | |
| download | android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.gz android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.bz2 android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.zip | |
Replace NULL macros with nullptr literals.
Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
Diffstat (limited to 'rsScriptIntrinsic.cpp')
| -rw-r--r-- | rsScriptIntrinsic.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rsScriptIntrinsic.cpp b/rsScriptIntrinsic.cpp index 7461d34a..ee9d73c5 100644 --- a/rsScriptIntrinsic.cpp +++ b/rsScriptIntrinsic.cpp @@ -64,7 +64,7 @@ void ScriptIntrinsic::runForEach(Context* rsc, size_t usrBytes, const RsScriptCall* sc) { - if (rsc->mHal.funcs.script.invokeForEachMulti != NULL) { + if (rsc->mHal.funcs.script.invokeForEachMulti != nullptr) { rsc->mHal.funcs.script.invokeForEachMulti(rsc, this, slot, ains, inLen, aout, usr, usrBytes, sc); @@ -98,7 +98,7 @@ RsScript rsi_ScriptIntrinsicCreate(Context *rsc, uint32_t id, RsElement ve) { ScriptIntrinsic *si = new ScriptIntrinsic(rsc); if (!si->init(rsc, (RsScriptIntrinsicID)id, (Element *)ve)) { delete si; - return NULL; + return nullptr; } si->incUserRef(); return si; |