Changeset 85:b0cb42d24e96 in finroc_plugins_data_ports


Ignore:
Timestamp:
24.01.2015 20:52:55 (5 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
14.08
Children:
86:caa4f8b68db8, 91:76d9b2487b32
Parents:
82:42573a7a0c06 (diff), 84:8564e024e4ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merged with 13.10

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • optimized/tThreadLocalBufferPools.cpp

    r69 r85  
    9393  { 
    9494    rrlib::thread::tLock lock(mutex); 
    95     for (auto it = garbage_pools.begin(); it != garbage_pools.end(); ++it) 
     95    for (auto it = garbage_pools.begin(); it != garbage_pools.end();) 
    9696    { 
    9797      if ((*it)->DeleteAllGarbage(false)) 
     
    100100        it = garbage_pools.erase(it); 
    101101      } 
     102      else 
     103      { 
     104        ++it; 
     105      } 
    102106    } 
    103107  } 
  • optimized/tThreadLocalBufferPools.cpp

    r84 r85  
    124124  tInitRegularDeleteTask() 
    125125  { 
     126#ifndef RRLIB_SINGLE_THREADED 
    126127    core::internal::tGarbageDeleter::AddRegularTask(DeleteGarbage); 
     128#endif 
    127129  } 
    128130}; 
Note: See TracChangeset for help on using the changeset viewer.