commit 89daad6bae798779e57f252e9da4fe4e62337124
author Tim Murray <timmurray@google.com> Mon Jul 29 14:30:02 2013 -0700
committer Tim Murray <timmurray@google.com> Thu Aug 01 14:14:07 2013 -0700
tree c55735f278a67b2fe5b74b42581cbfae9c99846c
parent dcfaa3c0bf151da7be31463bb3fa4e2b4aea6b8c

Add basic support for intrinsics. Move sp<> into RScpp.

Change-Id: I74cdee7069a624ded5091d53db3a4b8ce9894033

cpp/BaseObj.cpp

diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp
index 814e552..efcb83a 100644
--- a/cpp/BaseObj.cpp
+++ b/cpp/BaseObj.cpp
@@ -15,7 +15,6 @@
  */
 
 #include "RenderScript.h"
-#include <rs.h>
 
 using namespace android;
 using namespace RSC;
@@ -28,7 +27,7 @@
 }
 
 void * BaseObj::getObjID(sp<const BaseObj> o) {
-    return o.get() == NULL ? NULL : o->getID();
+    return o == NULL ? NULL : o->getID();
 }
 
 
@@ -55,9 +54,9 @@
     mName = name;
 }
 
-bool BaseObj::equals(const BaseObj *obj) {
+bool BaseObj::equals(sp<const BaseObj> obj) {
     // Early-out check to see if both BaseObjs are actually the same
-    if (this == obj)
+    if (this == obj.get())
         return true;
     return mID == obj->mID;
 }