247c247
< int active_threads = (*activeThreads).size();
---
> int active_threads = activeThreads->size();
249,251d248
< std::list<unsigned>::iterator threads = (*activeThreads).begin();
< std::list<unsigned>::iterator list_end = (*activeThreads).end();
<
262,263c259,265
< while (threads != list_end) {
< resizeEntries(maxEntries,*threads++);
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
>
> while (threads != end) {
> unsigned tid = *threads++;
>
> resizeEntries(maxEntries, tid);
288c290,291
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
290,291c293,294
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
337c340,341
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
339,340c343,344
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
356c360,361
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
358,359c363,365
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
373c379,380
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
375,376c382,384
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
389c397,398
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
391,392c400,402
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
405c415,416
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
407,408c418,420
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
421c433,434
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
423,424c436,438
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
437c451,452
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
439,440c454,456
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
461c477,478
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
463,465c480,483
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
< if (! (thread[tid].lqFull() || thread[tid].sqFull()) )
---
> while (threads != end) {
> unsigned tid = *threads++;
>
> if (!(thread[tid].lqFull() || thread[tid].sqFull()))
478c496
< if( lsqPolicy == Dynamic )
---
> if (lsqPolicy == Dynamic)
488c506,507
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
490,491c509,511
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
515c535,536
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
517,518c538,540
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
542c564,565
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
544,545c567,569
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
567c591,592
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
569c594
< if ((*activeThreads).empty())
---
> if (threads == end)
572,573c597,599
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
585c611,612
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
587,588c614,616
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>
600c628,629
< std::list<unsigned>::iterator active_threads = (*activeThreads).begin();
---
> std::list<unsigned>::iterator threads = activeThreads->begin();
> std::list<unsigned>::iterator end = activeThreads->end();
602,603c631,633
< while (active_threads != (*activeThreads).end()) {
< unsigned tid = *active_threads++;
---
> while (threads != end) {
> unsigned tid = *threads++;
>