mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmDependsC: Remove useless string preallocation artifact

Browse Source
This commit is contained in:
Sebastian Holtermann
2019-03-12 11:39:27 +01:00
parent d1a54ee26a
commit e81b425019
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmDependsC.cxx
View File

@@ -123,12 +123,6 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources,
}
std::set<std::string> scanned;
// Use reserve to allocate enough memory for tempPathStr
// so that during the loops no memory is allocated or freed
std::string tempPathStr;
tempPathStr.reserve(4 * 1024);
while (!this->Unscanned.empty()) {
// Get the next file to scan.
UnscannedEntry current = this->Unscanned.front();
@@ -152,17 +146,16 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources,
if (headerLocationIt != this->HeaderLocationCache.end()) {
fullName = headerLocationIt->second;
} else {
for (std::string const& i : this->IncludePath) {
for (std::string const& iPath : this->IncludePath) {
// Construct the name of the file as if it were in the current
// include directory. Avoid using a leading "./".
tempPathStr =
cmSystemTools::CollapseCombinedPath(i, current.FileName);
std::string tmpPath =
cmSystemTools::CollapseCombinedPath(iPath, current.FileName);
// Look for the file in this location.
if (cmSystemTools::FileExists(tempPathStr, true)) {
fullName = tempPathStr;
HeaderLocationCache[current.FileName] = fullName;
if (cmSystemTools::FileExists(tmpPath, true)) {
fullName = tmpPath;
this->HeaderLocationCache[current.FileName] = std::move(tmpPath);
break;
}
}