diff options
author | Travis Howell | 2006-04-04 23:26:11 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-04 23:26:11 +0000 |
commit | 194945f2a1c02ba5f4b4ec24a7579e63cbe52f93 (patch) | |
tree | 9aa1bbc6099435eed464ec1292fda7f1473259a2 /backends/fs/fs.cpp | |
parent | 853356613269d2dc300e1fa036ffdd6db1cd321c (diff) | |
download | scummvm-rg350-194945f2a1c02ba5f4b4ec24a7579e63cbe52f93.tar.gz scummvm-rg350-194945f2a1c02ba5f4b4ec24a7579e63cbe52f93.tar.bz2 scummvm-rg350-194945f2a1c02ba5f4b4ec24a7579e63cbe52f93.zip |
Rename variable in FSList::sort() to avoid conflict with system defines
svn-id: r21612
Diffstat (limited to 'backends/fs/fs.cpp')
-rw-r--r-- | backends/fs/fs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/fs/fs.cpp b/backends/fs/fs.cpp index df4a76bf07..4cc0432638 100644 --- a/backends/fs/fs.cpp +++ b/backends/fs/fs.cpp @@ -27,14 +27,14 @@ void FSList::sort() { // Simple selection sort for (iterator i = begin(); i != end(); ++i) { - iterator min(i); + iterator m(i); iterator j(i); ++j; for (; j != end(); ++j) - if (*j < *min) - min = j; - if (min != i) - SWAP(*min, *i); + if (*j < *m) + m = j; + if (m != i) + SWAP(*m, *i); } } |