commit b8353c5943f4038fd7f08db3d958390ce9418798
author Yang Ni <yangni@google.com> Sat Feb 14 18:00:59 2015 -0800
committer Yang Ni <yangni@google.com> Sun Feb 15 20:10:40 2015 +0000
tree 2cfac49d1f790e077f40dfc7ba42904ee5658f50
parent 1ce0dfd82311d4922dbffdde302599410fc25c5d

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

rsSampler.cpp

diff --git a/rsSampler.cpp b/rsSampler.cpp
index 924ba86..858658d 100644
--- a/rsSampler.cpp
+++ b/rsSampler.cpp
@@ -49,14 +49,10 @@
 }
 
 void Sampler::preDestroy() const {
-    auto &samplers = mRSC->mStateSampler.mAllSamplers;
-
-    for (auto sampleIter = samplers.begin(), endIter = samplers.end();
-         sampleIter != endIter; sampleIter++) {
-
-        if (this == *sampleIter) {
-            samplers.erase(sampleIter);
-            return;
+    for (uint32_t ct = 0; ct < mRSC->mStateSampler.mAllSamplers.size(); ct++) {
+        if (mRSC->mStateSampler.mAllSamplers[ct] == this) {
+            mRSC->mStateSampler.mAllSamplers.removeAt(ct);
+            break;
         }
     }
 }
@@ -117,7 +113,7 @@
 #endif
 
     ObjectBase::asyncLock();
-    rsc->mStateSampler.mAllSamplers.push_back(s);
+    rsc->mStateSampler.mAllSamplers.push(s);
     ObjectBase::asyncUnlock();
 
     return returnRef;