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 /cpp/BaseObj.cpp | |
parent | 4bb773ef75eeff5960852b733bcca5834020ee9e (diff) | |
download | rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.gz |
Replace NULL macros with nullptr literals.
Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
Diffstat (limited to 'cpp/BaseObj.cpp')
-rw-r--r-- | cpp/BaseObj.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp index 2e0a6377..e32d0a69 100644 --- a/cpp/BaseObj.cpp +++ b/cpp/BaseObj.cpp @@ -21,14 +21,14 @@ using namespace android; using namespace RSC; void * BaseObj::getID() const { - if (mID == NULL) { + if (mID == nullptr) { ALOGE("Internal error: Object id 0."); } return mID; } void * BaseObj::getObjID(sp<const BaseObj> o) { - return o == NULL ? NULL : o->getID(); + return o == nullptr ? nullptr : o->getID(); } @@ -47,12 +47,12 @@ BaseObj::~BaseObj() { if (mRS && mRS->getContext()) { RS::dispatch->ObjDestroy(mRS->getContext(), mID); } - mRS = NULL; - mID = NULL; + mRS = nullptr; + mID = nullptr; } void BaseObj::updateFromNative() { - const char *name = NULL; + const char *name = nullptr; RS::dispatch->GetName(mRS->getContext(), mID, &name); mName = name; } |