Mercurial > hg > svcore
comparison data/fft/FFTDataServer.cpp @ 912:2175c2ebd5c6 tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 14 May 2014 09:58:07 +0100 |
parents | 166e3fc1e962 |
children | 59e7fe1b1003 |
comparison
equal
deleted
inserted
replaced
901:68e880e0b857 | 912:2175c2ebd5c6 |
---|---|
866 // erase a reader that looks like it may no longer going to be | 866 // erase a reader that looks like it may no longer going to be |
867 // used by this thread for a while (leaving alone the current | 867 // used by this thread for a while (leaving alone the current |
868 // and previous cache readers) | 868 // and previous cache readers) |
869 int deleteCandidate = c - 2; | 869 int deleteCandidate = c - 2; |
870 if (deleteCandidate < 0) deleteCandidate = c + 2; | 870 if (deleteCandidate < 0) deleteCandidate = c + 2; |
871 if (deleteCandidate >= m_caches.size()) { | 871 if (deleteCandidate >= (int)m_caches.size()) { |
872 return true; | 872 return true; |
873 } | 873 } |
874 | 874 |
875 cb = m_caches.at(deleteCandidate); | 875 cb = m_caches.at(deleteCandidate); |
876 if (cb && cb->fileCacheReader.find(me) != cb->fileCacheReader.end()) { | 876 if (cb && cb->fileCacheReader.find(me) != cb->fileCacheReader.end()) { |