diff options
| author | Yang Ni <yangni@google.com> | 2015-02-14 18:00:59 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-02-15 20:10:40 +0000 |
| commit | b8353c5943f4038fd7f08db3d958390ce9418798 (patch) | |
| tree | 2cfac49d1f790e077f40dfc7ba42904ee5658f50 /rsProgramStore.cpp | |
| parent | 1ce0dfd82311d4922dbffdde302599410fc25c5d (diff) | |
| download | rs-b8353c5943f4038fd7f08db3d958390ce9418798.tar.gz | |
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
Diffstat (limited to 'rsProgramStore.cpp')
| -rw-r--r-- | rsProgramStore.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/rsProgramStore.cpp b/rsProgramStore.cpp index b07f820e..3ee75cc3 100644 --- a/rsProgramStore.cpp +++ b/rsProgramStore.cpp @@ -42,14 +42,10 @@ ProgramStore::ProgramStore(Context *rsc, } void ProgramStore::preDestroy() const { - auto &stores = mRSC->mStateFragmentStore.mStorePrograms; - - for (auto psIter = stores.begin(), endIter = stores.end(); - psIter != endIter; psIter++) { - - if (this == *psIter) { - stores.erase(psIter); - return; + for (uint32_t ct = 0; ct < mRSC->mStateFragmentStore.mStorePrograms.size(); ct++) { + if (mRSC->mStateFragmentStore.mStorePrograms[ct] == this) { + mRSC->mStateFragmentStore.mStorePrograms.removeAt(ct); + break; } } } @@ -122,7 +118,7 @@ ObjectBaseRef<ProgramStore> ProgramStore::getProgramStore(Context *rsc, pfs->init(); ObjectBase::asyncLock(); - rsc->mStateFragmentStore.mStorePrograms.push_back(pfs); + rsc->mStateFragmentStore.mStorePrograms.push(pfs); ObjectBase::asyncUnlock(); return returnRef; |