Mercurial > hg > easaier-soundaccess
comparison data/fileio/MatrixFile.cpp @ 190:61681a2bc1e6
keep MIN and MAX compatibility (VC and linux compilation)
author | lbajardsilogic |
---|---|
date | Tue, 27 Nov 2007 13:26:04 +0000 |
parents | fc9323a41f5a |
children |
comparison
equal
deleted
inserted
replaced
189:6a31322cd9ed | 190:61681a2bc1e6 |
---|---|
531 << rx + ti << ", reducing rw from " << rw << " to " | 531 << rx + ti << ", reducing rw from " << rw << " to " |
532 << ti << std::endl; | 532 << ti << std::endl; |
533 } | 533 } |
534 #endif | 534 #endif |
535 | 535 |
536 rw = min(rw, ti); | 536 rw = MIN(rw, ti); |
537 if (rw < 10 || rx + rw <= x) return; | 537 if (rw < 10 || rx + rw <= x) return; |
538 } | 538 } |
539 | 539 |
540 QMutexLocker locker(&m_cacheMutex); | 540 QMutexLocker locker(&m_cacheMutex); |
541 | 541 |