diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-07-28 16:54:38 -0700 |
|---|---|---|
| committer | Chris Wailes <chriswailes@google.com> | 2014-08-18 15:12:32 -0700 |
| commit | 93d6bc872b7d9fba63abfa7513d56b38d9c3d371 (patch) | |
| tree | 0a99fbd58c3254f82ffa1600f653aeac81c55d03 /rsProgramStore.cpp | |
| parent | 70d4971878444fe7cf4263998b0c3f46e2b6c71f (diff) | |
| download | android_frameworks_rs-93d6bc872b7d9fba63abfa7513d56b38d9c3d371.tar.gz android_frameworks_rs-93d6bc872b7d9fba63abfa7513d56b38d9c3d371.tar.bz2 android_frameworks_rs-93d6bc872b7d9fba63abfa7513d56b38d9c3d371.zip | |
Replaced android::Vector with std::vector.
Change-Id: I4c6abd964dc4b1412ec2e592fc8e835fecfe53f6
Diffstat (limited to 'rsProgramStore.cpp')
| -rw-r--r-- | rsProgramStore.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rsProgramStore.cpp b/rsProgramStore.cpp index 83c1f2c0..b2d527e9 100644 --- a/rsProgramStore.cpp +++ b/rsProgramStore.cpp @@ -42,10 +42,14 @@ ProgramStore::ProgramStore(Context *rsc, } void ProgramStore::preDestroy() const { - for (uint32_t ct = 0; ct < mRSC->mStateFragmentStore.mStorePrograms.size(); ct++) { - if (mRSC->mStateFragmentStore.mStorePrograms[ct] == this) { - mRSC->mStateFragmentStore.mStorePrograms.removeAt(ct); - break; + auto &stores = mRSC->mStateFragmentStore.mStorePrograms; + + for (auto psIter = stores.begin(), endIter = stores.end(); + psIter != endIter; psIter++) { + + if (this == *psIter) { + stores.erase(psIter); + return; } } } @@ -118,7 +122,7 @@ ObjectBaseRef<ProgramStore> ProgramStore::getProgramStore(Context *rsc, pfs->init(); ObjectBase::asyncLock(); - rsc->mStateFragmentStore.mStorePrograms.push(pfs); + rsc->mStateFragmentStore.mStorePrograms.push_back(pfs); ObjectBase::asyncUnlock(); return returnRef; |