diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-26 11:08:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-26 11:08:36 (GMT) |
| commit | 2919f65c2463c168c5a054e48a99a51dcdb86f60 (patch) | |
| tree | 2d86313354de81df2a7ef6aba0122574d13194ac /Source | |
| parent | b39d240f5dbb3e7bcc07ad1b158a8ef8172bfe78 (diff) | |
| parent | 1ff1f757182139914aa2d3d4e51509ef89f48241 (diff) | |
| download | CMake-2919f65c2463c168c5a054e48a99a51dcdb86f60.zip CMake-2919f65c2463c168c5a054e48a99a51dcdb86f60.tar.gz CMake-2919f65c2463c168c5a054e48a99a51dcdb86f60.tar.bz2 | |
Merge topic 'fix-xcode6-compilation'
1ff1f75718 Fix Xcode 6.1.1 compilation issue
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3480
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmRuntimeDependencyArchive.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmRuntimeDependencyArchive.cxx b/Source/cmRuntimeDependencyArchive.cxx index b4c6c32..a1d1f95 100644 --- a/Source/cmRuntimeDependencyArchive.cxx +++ b/Source/cmRuntimeDependencyArchive.cxx @@ -342,10 +342,7 @@ void cmRuntimeDependencyArchive::AddResolvedPath(const std::string& name, const std::string& path, bool& unique) { - auto it = - this->ResolvedPaths - .insert(std::pair<std::string, std::set<std::string>>{ name, {} }) - .first; + auto it = this->ResolvedPaths.emplace(name, std::set<std::string>{}).first; unique = true; for (auto const& other : it->second) { if (cmSystemTools::SameFile(path, other)) { |