commit 44bef6fba6244292b751387f3d6c31cca96c28ad
author Chris Wailes <chriswailes@google.com> Tue Aug 12 13:51:10 2014 -0700
committer Stephen Hines <srhines@google.com> Wed Aug 20 18:14:27 2014 -0700
tree a9dd48535a1f3343315bc75f7751cf042c05dc67
parent 4bb773ef75eeff5960852b733bcca5834020ee9e

Replace NULL macros with nullptr literals.

Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398

rsScriptGroup.cpp

diff --git a/rsScriptGroup.cpp b/rsScriptGroup.cpp
index f41c65d..618c28c 100644
--- a/rsScriptGroup.cpp
+++ b/rsScriptGroup.cpp
@@ -54,7 +54,7 @@
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 bool ScriptGroup::calcOrderRecurse(Node *node0, int depth) {
@@ -65,7 +65,7 @@
     bool ret = true;
 
     for (auto link : node0->mOutputs) {
-        Node *node1 = NULL;
+        Node *node1 = nullptr;
         if (link->mDstField.get()) {
             node1 = findNode(link->mDstField->mScript);
         } else {
@@ -86,7 +86,7 @@
     for (auto kernelRef : mKernels) {
         const ScriptKernelID *kernel = kernelRef.get();
         Node *node = findNode(kernel->mScript);
-        if (node == NULL) {
+        if (node == nullptr) {
             node = new Node(kernel->mScript);
             mNodes.push_back(node);
         }
@@ -253,14 +253,14 @@
 
 bool ScriptGroup::validateInputAndOutput(Context *rsc) {
     for(size_t i = 0; i < mInputs.size(); i++) {
-        if (mInputs[i]->mAlloc.get() == NULL) {
+        if (mInputs[i]->mAlloc.get() == nullptr) {
             rsc->setError(RS_ERROR_BAD_VALUE, "ScriptGroup missing input.");
             return false;
         }
     }
 
     for(size_t i = 0; i < mOutputs.size(); i++) {
-        if (mOutputs[i]->mAlloc.get() == NULL) {
+        if (mOutputs[i]->mAlloc.get() == nullptr) {
             rsc->setError(RS_ERROR_BAD_VALUE, "ScriptGroup missing output.");
             return false;
         }
@@ -283,8 +283,8 @@
 
     for (auto node : mNodes) {
         for (auto kernel : node->mKernels) {
-            Allocation *ain  = NULL;
-            Allocation *aout = NULL;
+            Allocation *ain  = nullptr;
+            Allocation *aout = nullptr;
 
             for (auto nodeInput : node->mInputs) {
                 if (nodeInput->mDstKernel.get() == kernel) {
@@ -310,14 +310,14 @@
                 }
             }
 
-            if (ain == NULL) {
-                node->mScript->runForEach(rsc, kernel->mSlot, NULL, 0, aout,
-                                          NULL, 0);
+            if (ain == nullptr) {
+                node->mScript->runForEach(rsc, kernel->mSlot, nullptr, 0, aout,
+                                          nullptr, 0);
             } else {
                 const Allocation *ains[1] = {ain};
                 node->mScript->runForEach(rsc, kernel->mSlot, ains,
                                           sizeof(ains) / sizeof(RsAllocation),
-                                          aout, NULL, 0);
+                                          aout, nullptr, 0);
             }
         }
     }