Revert "Replaced android::Vector with std::vector."
b/19148482
This reverts commit 93d6bc872b7d9fba63abfa7513d56b38d9c3d371.
I also made some changes to Make it work with HEAD.
Change-Id: I5e516976ec1d85ffe1cf388c01795348a9441982
diff --git a/rsContext.cpp b/rsContext.cpp
index 7243118..5818b66 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -762,15 +762,13 @@
void Context::assignName(ObjectBase *obj, const char *name, uint32_t len) {
rsAssert(!obj->getName());
obj->setName(name, len);
- mNames.push_back(obj);
+ mNames.add(obj);
}
void Context::removeName(ObjectBase *obj) {
- for (auto nameIter = mNames.begin(), endIter = mNames.end();
- nameIter != endIter; nameIter++) {
-
- if (obj == *nameIter) {
- mNames.erase(nameIter);
+ for (size_t ct=0; ct < mNames.size(); ct++) {
+ if (obj == mNames[ct]) {
+ mNames.removeAt(ct);
return;
}
}
@@ -1012,3 +1010,4 @@
ObjectBase *ob = static_cast<ObjectBase *>(obj);
(*name) = ob->getName();
}
+
