commit 900c6c1f08f7c572125d7d39abe0f0f9eafbfa14
author Chris Wailes <chriswailes@google.com> Wed Aug 13 15:40:00 2014 -0700
committer Stephen Hines <srhines@google.com> Wed Aug 20 18:15:48 2014 -0700
tree 22cca36b96db74d83980c5a3b68902dbcb1803a9
parent def585e3621d073fe2f2b747cd1f0556d62c6656

Replace NULL macros with nullptr literals.

Change-Id: Id2311cda59dd42c74b3ed54d3ff6cfd509012738

lib/Renderscript/RSScript.cpp

diff --git a/lib/Renderscript/RSScript.cpp b/lib/Renderscript/RSScript.cpp
index 884de22..2dadc66 100644
--- a/lib/Renderscript/RSScript.cpp
+++ b/lib/Renderscript/RSScript.cpp
@@ -24,18 +24,18 @@
 using namespace bcc;
 
 bool RSScript::LinkRuntime(RSScript &pScript, const char *core_lib) {
-  bccAssert(core_lib != NULL);
+  bccAssert(core_lib != nullptr);
 
   // Using the same context with the source in pScript.
   BCCContext &context = pScript.getSource().getContext();
 
   Source *libclcore_source = Source::CreateFromFile(context, core_lib);
-  if (libclcore_source == NULL) {
+  if (libclcore_source == nullptr) {
     ALOGE("Failed to load Renderscript library '%s' to link!", core_lib);
     return false;
   }
 
-  if (NULL != pScript.mLinkRuntimeCallback) {
+  if (pScript.mLinkRuntimeCallback != nullptr) {
     pScript.mLinkRuntimeCallback(&pScript,
         &pScript.getSource().getModule(), &libclcore_source->getModule());
   }
@@ -51,12 +51,12 @@
 }
 
 RSScript::RSScript(Source &pSource)
-  : Script(pSource), mInfo(NULL), mCompilerVersion(0),
-    mOptimizationLevel(kOptLvl3), mLinkRuntimeCallback(NULL),
+  : Script(pSource), mInfo(nullptr), mCompilerVersion(0),
+    mOptimizationLevel(kOptLvl3), mLinkRuntimeCallback(nullptr),
     mEmbedInfo(false) { }
 
 bool RSScript::doReset() {
-  mInfo = NULL;
+  mInfo = nullptr;
   mCompilerVersion = 0;
   mOptimizationLevel = kOptLvl3;
   return true;