am 3fa79f84: Merge changes I4c6abd96,I9bcf36d0

* commit '3fa79f84fcce0b5f59498980a2bb8e355cf53cd4':
  Replaced android::Vector with std::vector.
  Adjust to handle the change to std::vector in libbcc.

1 files changed, 6 insertions, 5 deletions

diff --git a/rsContext.cpp b/rsContext.cpp
index 2112ace8..0d9ca054 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -747,13 +747,15 @@ void Context::finish() {
 void Context::assignName(ObjectBase *obj, const char *name, uint32_t len) {
     rsAssert(!obj->getName());
     obj->setName(name, len);
-    mNames.add(obj);
+    mNames.push_back(obj);
 }
 
 void Context::removeName(ObjectBase *obj) {
-    for (size_t ct=0; ct < mNames.size(); ct++) {
-        if (obj == mNames[ct]) {
-            mNames.removeAt(ct);
+    for (auto nameIter = mNames.begin(), endIter = mNames.end();
+         nameIter != endIter; nameIter++) {
+
+        if (obj == *nameIter) {
+            mNames.erase(nameIter);
             return;
         }
     }
@@ -988,4 +990,3 @@ void rsaGetName(RsContext con, void * obj, const char **name) {
     ObjectBase *ob = static_cast<ObjectBase *>(obj);
     (*name) = ob->getName();
 }
-