summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-08 15:21:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-12-08 15:21:33 (GMT)
commit7775cbdb821b928dbdb382c18977d78d4e8ea48d (patch)
treee16f609b0ef5ca96d992c06b014db9273c29cc60
parent7e83dc0764eb224cbc0b3deadb32443ed4751dda (diff)
parent99a26babb1dc42a83a73869883684b76a538047c (diff)
downloadCMake-7775cbdb821b928dbdb382c18977d78d4e8ea48d.zip
CMake-7775cbdb821b928dbdb382c18977d78d4e8ea48d.tar.gz
CMake-7775cbdb821b928dbdb382c18977d78d4e8ea48d.tar.bz2
Merge topic 'range-for-avoid-tmp-warning'
99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5578
-rw-r--r--Source/cmLocalGenerator.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c0ffd64..c9dfdea 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3,6 +3,7 @@
#include "cmLocalGenerator.h"
#include <algorithm>
+#include <array>
#include <cassert>
#include <cstdio>
#include <cstdlib>
@@ -2475,8 +2476,10 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
target->GetSourceFiles(sources, config);
const std::string configUpper = cmSystemTools::UpperCase(config);
+ static const std::array<std::string, 4> langs = { { "C", "CXX", "OBJC",
+ "OBJCXX" } };
- for (const std::string& lang : { "C", "CXX", "OBJC", "OBJCXX" }) {
+ for (const std::string& lang : langs) {
auto langSources = std::count_if(
sources.begin(), sources.end(), [lang](cmSourceFile* sf) {
return lang == sf->GetLanguage() &&