158c158
< int active_threads = (*activeThreads).size();
---
> int active_threads = activeThreads->size();
160,161c160,161
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
< std::list<unsigned>::iterator list_end = (*activeThreads).end();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
163c163,165
< while (threads != list_end) {
---
> while (threads != end) {
> unsigned tid = *threads++;
>
165c167
< maxEntries[*threads++] = numEntries / active_threads;
---
> maxEntries[tid] = numEntries / active_threads;
167c169
< maxEntries[*threads++] = numEntries;
---
> maxEntries[tid] = numEntries;
321c323,324
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
323c326
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {
435c438,439
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
437,438c441,442
< while (threads != (*activeThreads).end()) {
< unsigned thread_num = *threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
440c444
< if (instList[thread_num].empty())
---
> if (instList[tid].empty())
444c448
< head = instList[thread_num].begin();
---
> head = instList[tid].begin();
450c454
< InstIt head_thread = instList[thread_num].begin();
---
> InstIt head_thread = instList[tid].begin();
475c479,480
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
477c482
< while (threads != (*activeThreads).end()) {
---
> while (threads != end) {