From 9d13e1679f2b52e88748a710edd201ed9fba7447 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 21 Jul 2014 11:14:26 -0400 Subject: [PATCH] cmTarget: Remove duplicate link interface map No target is both imported and not imported so we do not need separate link interface maps for them. --- Source/cmTarget.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 9d00591e9..dc8384d63 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -141,11 +141,6 @@ public: LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; bool PolicyWarnedCMP0022; - typedef std::map - ImportLinkInterfaceMapType; - ImportLinkInterfaceMapType ImportLinkInterfaceMap; - ImportLinkInterfaceMapType ImportLinkInterfaceUsageRequirementsOnlyMap; - typedef std::map OutputInfoMapType; OutputInfoMapType OutputInfoMap; @@ -528,8 +523,6 @@ void cmTarget::ClearLinkMaps() this->Internal->LinkImplMap.clear(); this->Internal->LinkInterfaceMap.clear(); this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear(); - this->Internal->ImportLinkInterfaceMap.clear(); - this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap.clear(); this->Internal->LinkClosureMap.clear(); for (cmTargetLinkInformationMap::const_iterator it = this->LinkInformation.begin(); @@ -5826,10 +5819,10 @@ cmTarget::GetImportLinkInterface(const std::string& config, } TargetConfigPair key(headTarget, cmSystemTools::UpperCase(config)); - cmTargetInternals::ImportLinkInterfaceMapType& lim = + cmTargetInternals::LinkInterfaceMapType& lim = (usage_requirements_only ? - this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap : - this->Internal->ImportLinkInterfaceMap); + this->Internal->LinkInterfaceUsageRequirementsOnlyMap : + this->Internal->LinkInterfaceMap); cmTargetInternals::OptionalLinkInterface& iface = lim[key]; if(!iface.AllDone)