diff options
author | Regina Pfeifer <regina@mailbox.org> | 2019-09-04 16:03:01 (GMT) |
---|---|---|
committer | Regina Pfeifer <regina@mailbox.org> | 2019-09-04 16:03:01 (GMT) |
commit | a1ddf2d0ba6268e29a9456948828f59d044791f1 (patch) | |
tree | b7046d67c6667c945e3683cf890d725c7123e2bd /Source/cmGeneratorTarget.h | |
parent | ee15bc7d7e7707fd8d7db92645c2c56a5df0f681 (diff) | |
download | CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.zip CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.tar.gz CMake-a1ddf2d0ba6268e29a9456948828f59d044791f1.tar.bz2 |
clang-tidy: Replace typedef with using
Automate the conversion with
perl -i -0pe 's/typedef ([^;]*) ([^ ]+);/using $2 = $1;/g'
then manually fix a few places.
Diffstat (limited to 'Source/cmGeneratorTarget.h')
-rw-r--r-- | Source/cmGeneratorTarget.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 4701071..9eb2ecf 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -531,7 +531,7 @@ public: CompileInfo const* GetCompileInfo(const std::string& config) const; - typedef std::map<std::string, CompileInfo> CompileInfoMapType; + using CompileInfoMapType = std::map<std::string, CompileInfo>; mutable CompileInfoMapType CompileInfoMap; bool IsNullImpliedByLinkLibraries(const std::string& p) const; @@ -745,7 +745,7 @@ private: { std::vector<cmSourceFile*> Depends; }; - typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType; + using SourceEntriesType = std::map<cmSourceFile const*, SourceEntry>; SourceEntriesType SourceDepends; mutable std::map<cmSourceFile const*, std::string> Objects; std::set<cmSourceFile const*> ExplicitObjectName; @@ -775,7 +775,7 @@ private: std::string& outPrefix, std::string& outBase, std::string& outSuffix) const; - typedef std::map<std::string, LinkClosure> LinkClosureMapType; + using LinkClosureMapType = std::map<std::string, LinkClosure>; mutable LinkClosureMapType LinkClosureMap; // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type. @@ -802,8 +802,8 @@ private: }; mutable std::map<std::string, CompatibleInterfaces> CompatibleInterfacesMap; - typedef std::map<std::string, cmComputeLinkInformation*> - cmTargetLinkInformationMap; + using cmTargetLinkInformationMap = + std::map<std::string, cmComputeLinkInformation*>; mutable cmTargetLinkInformationMap LinkInformation; void CheckPropertyCompatibility(cmComputeLinkInformation* info, @@ -815,7 +815,7 @@ private: }; mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap; - typedef std::map<std::string, cmHeadToLinkInterfaceMap> LinkInterfaceMapType; + using LinkInterfaceMapType = std::map<std::string, cmHeadToLinkInterfaceMap>; mutable LinkInterfaceMapType LinkInterfaceMap; mutable LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; @@ -843,7 +843,7 @@ private: std::string SharedDeps; }; - typedef std::map<std::string, ImportInfo> ImportInfoMapType; + using ImportInfoMapType = std::map<std::string, ImportInfo>; mutable ImportInfoMapType ImportInfoMap; void ComputeImportInfo(std::string const& desired_config, ImportInfo& info) const; @@ -857,7 +857,7 @@ private: const std::string& config, const cmGeneratorTarget* head, bool usage_requirements_only) const; - typedef std::map<std::string, KindedSources> KindedSourcesMapType; + using KindedSourcesMapType = std::map<std::string, KindedSources>; mutable KindedSourcesMapType KindedSourcesMap; void ComputeKindedSources(KindedSources& files, std::string const& config) const; @@ -902,7 +902,7 @@ private: : public std::map<cmGeneratorTarget const*, cmOptionalLinkImplementation> { }; - typedef std::map<std::string, HeadToLinkImplementationMap> LinkImplMapType; + using LinkImplMapType = std::map<std::string, HeadToLinkImplementationMap>; mutable LinkImplMapType LinkImplMap; cmLinkImplementationLibraries const* GetLinkImplementationLibrariesInternal( @@ -911,17 +911,17 @@ private: cmStateEnums::ArtifactType artifact, std::string& out) const; - typedef std::map<std::string, OutputInfo> OutputInfoMapType; + using OutputInfoMapType = std::map<std::string, OutputInfo>; mutable OutputInfoMapType OutputInfoMap; - typedef std::map<std::string, ModuleDefinitionInfo> - ModuleDefinitionInfoMapType; + using ModuleDefinitionInfoMapType = + std::map<std::string, ModuleDefinitionInfo>; mutable ModuleDefinitionInfoMapType ModuleDefinitionInfoMap; void ComputeModuleDefinitionInfo(std::string const& config, ModuleDefinitionInfo& info) const; - typedef std::pair<std::string, cmStateEnums::ArtifactType> OutputNameKey; - typedef std::map<OutputNameKey, std::string> OutputNameMapType; + using OutputNameKey = std::pair<std::string, cmStateEnums::ArtifactType>; + using OutputNameMapType = std::map<OutputNameKey, std::string>; mutable OutputNameMapType OutputNameMap; mutable std::set<cmLinkItem> UtilityItems; cmPolicies::PolicyMap PolicyMap; |