diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-06 16:37:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-06 16:38:04 (GMT) |
| commit | ca8c3d64c8accebeacf322f0574494ffddb039c5 (patch) | |
| tree | 8e5ef52b55ceb4920e7e063cf91b15487915643a /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 45e90f62dd422a93b14b5ed9d49d26a51116d4fd (diff) | |
| parent | 1d3f5ebb0d3da35d1b5b1287f39115b188ac5f6a (diff) | |
| download | CMake-ca8c3d64c8accebeacf322f0574494ffddb039c5.zip CMake-ca8c3d64c8accebeacf322f0574494ffddb039c5.tar.gz CMake-ca8c3d64c8accebeacf322f0574494ffddb039c5.tar.bz2 | |
Merge topic 'use-using'
1d3f5ebb0d clang-tidy: Enable check modernize-use-using
a1ddf2d0ba clang-tidy: Replace typedef with using
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3782
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 74d97e1..10f822f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1244,8 +1244,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget( // framework or bundle targets std::vector<cmXCodeObject*> contentBuildPhases; if (isFrameworkTarget || isBundleTarget || isCFBundleTarget) { - typedef std::map<std::string, std::vector<cmSourceFile*>> - mapOfVectorOfSourceFiles; + using mapOfVectorOfSourceFiles = + std::map<std::string, std::vector<cmSourceFile*>>; mapOfVectorOfSourceFiles bundleFiles; for (auto sourceFile : classes) { cmGeneratorTarget::SourceFileFlags tsFlags = @@ -1292,8 +1292,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget( // create vector of "resource content file" build phases - only for // framework or bundle targets if (isFrameworkTarget || isBundleTarget || isCFBundleTarget) { - typedef std::map<std::string, std::vector<cmSourceFile*>> - mapOfVectorOfSourceFiles; + using mapOfVectorOfSourceFiles = + std::map<std::string, std::vector<cmSourceFile*>>; mapOfVectorOfSourceFiles bundleFiles; for (auto sourceFile : classes) { cmGeneratorTarget::SourceFileFlags tsFlags = @@ -3049,7 +3049,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( this->CreateObject(cmXCodeObject::XCConfigurationList); cmXCodeObject* buildConfigurations = this->CreateObject(cmXCodeObject::OBJECT_LIST); - typedef std::vector<std::pair<std::string, cmXCodeObject*>> Configs; + using Configs = std::vector<std::pair<std::string, cmXCodeObject*>>; Configs configs; std::string defaultConfigName; for (const auto& name : this->CurrentConfigurationTypes) { |