This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dc40de0fc18c30d271bdca360571f59d724f938f (commit)
via 21618656586436977c732bfa471eb08d4c4e6880 (commit)
from e80f2479d8e61372a87c70c9882d6fa4970386f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc40de0fc18c30d271bdca360571f59d724f938f
commit dc40de0fc18c30d271bdca360571f59d724f938f
Merge: e80f247 2161865
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 7 15:10:44 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 7 15:10:44 2013 -0500
Merge topic 'LINK_LIBRARIES-property' into next
2161865 Introduce TargetConfigPair instead of using std::pair.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21618656586436977c732bfa471eb08d4c4e6880
commit 21618656586436977c732bfa471eb08d4c4e6880
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 7 21:06:29 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jan 7 21:06:29 2013 +0100
Introduce TargetConfigPair instead of using std::pair.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index baa52be..25054c5 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -72,6 +72,11 @@ struct cmTarget::ImportInfo
cmTarget::LinkInterface LinkInterface;
};
+struct TargetConfigPair : public std::pair<cmTarget*, std::string> {
+ TargetConfigPair(cmTarget* tgt, const std::string &config)
+ : std::pair<cmTarget*, std::string>(tgt, config) {}
+};
+
//----------------------------------------------------------------------------
class cmTargetInternals
{
@@ -100,23 +105,23 @@ public:
OptionalLinkInterface(): Exists(false) {}
bool Exists;
};
- typedef std::map<std::pair<cmTarget*, std::string>, OptionalLinkInterface>
+ typedef std::map<TargetConfigPair, OptionalLinkInterface>
LinkInterfaceMapType;
LinkInterfaceMapType LinkInterfaceMap;
typedef std::map<cmStdString, cmTarget::OutputInfo> OutputInfoMapType;
OutputInfoMapType OutputInfoMap;
- typedef std::map<std::pair<cmTarget*, std::string>, cmTarget::ImportInfo>
+ typedef std::map<TargetConfigPair, cmTarget::ImportInfo>
ImportInfoMapType;
ImportInfoMapType ImportInfoMap;
// Cache link implementation computation from each configuration.
- typedef std::map<std::pair<cmTarget*, std::string>,
+ typedef std::map<TargetConfigPair,
cmTarget::LinkImplementation> LinkImplMapType;
LinkImplMapType LinkImplMap;
- typedef std::map<std::pair<cmTarget*, std::string>, cmTarget::LinkClosure>
+ typedef std::map<TargetConfigPair, cmTarget::LinkClosure>
LinkClosureMapType;
LinkClosureMapType LinkClosureMap;
@@ -3165,8 +3170,7 @@ const char* cmTarget::GetLinkerLanguage(const char*
config, cmTarget *head)
cmTarget::LinkClosure const* cmTarget::GetLinkClosure(const char* config,
cmTarget *head)
{
- std::pair<cmTarget*, std::string> key =
- std::make_pair(head, cmSystemTools::UpperCase(config ? config : ""));
+ TargetConfigPair key(head, cmSystemTools::UpperCase(config ? config : ""));
cmTargetInternals::LinkClosureMapType::iterator
i = this->Internal->LinkClosureMap.find(key);
if(i == this->Internal->LinkClosureMap.end())
@@ -4467,8 +4471,7 @@ cmTarget::GetImportInfo(const char* config, cmTarget
*headTarget)
{
config_upper = "NOCONFIG";
}
- std::pair<cmTarget*, std::string> key = std::make_pair(headTarget,
- config_upper);
+ TargetConfigPair key(headTarget, config_upper);
typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
ImportInfoMapType::const_iterator i =
@@ -4798,8 +4801,7 @@ cmTarget::LinkInterface const*
cmTarget::GetLinkInterface(const char* config,
}
// Lookup any existing link interface for this configuration.
- std::pair<cmTarget*, std::string> key = std::make_pair(head,
- cmSystemTools::UpperCase(config? config : ""));
+ TargetConfigPair key(head, cmSystemTools::UpperCase(config? config : ""));
cmTargetInternals::LinkInterfaceMapType::iterator
i = this->Internal->LinkInterfaceMap.find(key);
@@ -4947,8 +4949,7 @@ cmTarget::GetLinkImplementation(const char* config,
cmTarget *head)
}
// Lookup any existing link implementation for this configuration.
- std::pair<cmTarget*, std::string> key = std::make_pair(head,
- cmSystemTools::UpperCase(config? config : ""));
+ TargetConfigPair key(head, cmSystemTools::UpperCase(config? config : ""));
cmTargetInternals::LinkImplMapType::iterator
i = this->Internal->LinkImplMap.find(key);
@@ -5095,10 +5096,9 @@ cmTarget::GetLinkInformation(const char* config,
cmTarget *head)
{
cmTarget *headTarget = head ? head : this;
// Lookup any existing information for this configuration.
- std::pair<cmTarget*, std::string> key = std::make_pair(headTarget,
+ TargetConfigPair key(headTarget,
cmSystemTools::UpperCase(config?config:""));
- std::map<std::pair<cmTarget*, std::string>,
- cmComputeLinkInformation*>::iterator
+ cmTargetLinkInformationMap::iterator
i = this->LinkInformation.find(key);
if(i == this->LinkInformation.end())
{
@@ -5112,9 +5112,7 @@ cmTarget::GetLinkInformation(const char* config, cmTarget
*head)
}
// Store the information for this configuration.
- std::map<std::pair<cmTarget*, std::string>,
- cmComputeLinkInformation*>::value_type
- entry(key, info);
+ cmTargetLinkInformationMap::value_type entry(key, info);
i = this->LinkInformation.insert(entry).first;
}
return i->second;
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
