diff options
Diffstat (limited to 'buildtool.cpp')
| -rw-r--r-- | buildtool.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/buildtool.cpp b/buildtool.cpp index bcec40c93..11d6b7fa9 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -4416,21 +4416,18 @@ std::vector<DepRec> DepTool::loadDepFile(const String &depFile) std::vector<DepRec>::iterator iter; for (iter = result.begin() ; iter != result.end() ; iter++) { - if (iter->path > depObject.path) + String vpath = iter->path; + vpath.append("/"); + vpath.append(iter->name); + String opath = depObject.path; + opath.append("/"); + opath.append(depObject.name); + if (vpath > opath) { inserted = true; iter = result.insert(iter, depObject); break; } - else if (iter->path == depObject.path) - { - if (iter->name > depObject.name) - { - inserted = true; - iter = result.insert(iter, depObject); - break; - } - } } if (!inserted) result.push_back(depObject); |