diff options
author | Brad King <brad.king@kitware.com> | 2017-09-13 12:34:49 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-13 12:35:05 (GMT) |
commit | 67810849b95acfe036a9a605dbda6f0a3d6f7493 (patch) | |
tree | fa63356603dd00956f306eb92d4ecdbca9e450d4 /Source/cmSourceFile.cxx | |
parent | a763cffd6b65bbe5572527e39969981bf31d5aca (diff) | |
parent | 7d5095796ab616cf9b709036387bb95ab9984141 (diff) | |
download | CMake-67810849b95acfe036a9a605dbda6f0a3d6f7493.zip CMake-67810849b95acfe036a9a605dbda6f0a3d6f7493.tar.gz CMake-67810849b95acfe036a9a605dbda6f0a3d6f7493.tar.bz2 |
Merge topic 'ranged-for'
7d509579 Meta: modernize old-fashioned loops to range-based `for`.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1249
Diffstat (limited to 'Source/cmSourceFile.cxx')
-rw-r--r-- | Source/cmSourceFile.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index 6d2b98d..0964bea 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -150,15 +150,13 @@ bool cmSourceFile::FindFullPath(std::string* error) if (this->TryFullPath(tryPath, "")) { return true; } - for (std::vector<std::string>::const_iterator ei = srcExts.begin(); - ei != srcExts.end(); ++ei) { - if (this->TryFullPath(tryPath, *ei)) { + for (std::string const& ext : srcExts) { + if (this->TryFullPath(tryPath, ext)) { return true; } } - for (std::vector<std::string>::const_iterator ei = hdrExts.begin(); - ei != hdrExts.end(); ++ei) { - if (this->TryFullPath(tryPath, *ei)) { + for (std::string const& ext : hdrExts) { + if (this->TryFullPath(tryPath, ext)) { return true; } } @@ -171,13 +169,11 @@ bool cmSourceFile::FindFullPath(std::string* error) } missing += this->Location.GetName(); e << "Cannot find source file:\n " << missing << "\nTried extensions"; - for (std::vector<std::string>::const_iterator ext = srcExts.begin(); - ext != srcExts.end(); ++ext) { - e << " ." << *ext; + for (std::string const& srcExt : srcExts) { + e << " ." << srcExt; } - for (std::vector<std::string>::const_iterator ext = hdrExts.begin(); - ext != hdrExts.end(); ++ext) { - e << " ." << *ext; + for (std::string const& ext : hdrExts) { + e << " ." << ext; } if (error) { *error = e.str(); |