summaryrefslogtreecommitdiff
path: root/rsContext.cpp
diff options
context:
space:
mode:
authorChris Wailes <chriswailes@google.com>2014-07-28 16:54:38 -0700
committerChris Wailes <chriswailes@google.com>2014-08-18 15:12:32 -0700
commit93d6bc872b7d9fba63abfa7513d56b38d9c3d371 (patch)
tree0a99fbd58c3254f82ffa1600f653aeac81c55d03 /rsContext.cpp
parent70d4971878444fe7cf4263998b0c3f46e2b6c71f (diff)
downloadrs-93d6bc872b7d9fba63abfa7513d56b38d9c3d371.tar.gz
Replaced android::Vector with std::vector.
Change-Id: I4c6abd964dc4b1412ec2e592fc8e835fecfe53f6
Diffstat (limited to 'rsContext.cpp')
-rw-r--r--rsContext.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/rsContext.cpp b/rsContext.cpp
index d3d8349d..410ab354 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -743,13 +743,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;
}
}
@@ -984,4 +986,3 @@ void rsaGetName(RsContext con, void * obj, const char **name) {
ObjectBase *ob = static_cast<ObjectBase *>(obj);
(*name) = ob->getName();
}
-