[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1421-g985f897

[Stephen Kelly]

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  985f897cd6965db5ce96765fafbaee210ec05b86 (commit)
       via  4cf80ccd53dab30970694c405aba76aea3f030fc (commit)
      from  a4e06eec06140c0bb4fa6872e3b47b78679c557d (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=985f897cd6965db5ce96765fafbaee210ec05b86
commit 985f897cd6965db5ce96765fafbaee210ec05b86
Merge: a4e06ee 4cf80cc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 6 08:07:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 6 08:07:46 2013 -0500

    Merge topic 'LINK_LIBRARIES-property' into next
    
    4cf80cc Make sure types match exacty without conversion when making std::pairs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cf80ccd53dab30970694c405aba76aea3f030fc
commit 4cf80ccd53dab30970694c405aba76aea3f030fc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 6 14:06:14 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 6 14:07:05 2013 +0100

    Make sure types match exacty without conversion when making std::pairs.
    
    Fixes the SunCC build, hopefully.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a44fbe6..baa52be 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -100,23 +100,23 @@ public:
     OptionalLinkInterface(): Exists(false) {}
     bool Exists;
   };
-  typedef std::map<std::pair<cmTarget*, cmStdString>, OptionalLinkInterface>
+  typedef std::map<std::pair<cmTarget*, std::string>, OptionalLinkInterface>
                                                           LinkInterfaceMapType;
   LinkInterfaceMapType LinkInterfaceMap;
 
   typedef std::map<cmStdString, cmTarget::OutputInfo> OutputInfoMapType;
   OutputInfoMapType OutputInfoMap;
 
-  typedef std::map<std::pair<cmTarget*, cmStdString>, cmTarget::ImportInfo>
+  typedef std::map<std::pair<cmTarget*, std::string>, cmTarget::ImportInfo>
                                                             ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
   // Cache link implementation computation from each configuration.
-  typedef std::map<std::pair<cmTarget*, cmStdString>,
+  typedef std::map<std::pair<cmTarget*, std::string>,
                    cmTarget::LinkImplementation> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  typedef std::map<std::pair<cmTarget*, cmStdString>, cmTarget::LinkClosure>
+  typedef std::map<std::pair<cmTarget*, std::string>, cmTarget::LinkClosure>
                                                           LinkClosureMapType;
   LinkClosureMapType LinkClosureMap;
 
@@ -3165,7 +3165,7 @@ const char* cmTarget::GetLinkerLanguage(const char* config, cmTarget *head)
 cmTarget::LinkClosure const* cmTarget::GetLinkClosure(const char* config,
                                                       cmTarget *head)
 {
-  std::pair<cmTarget*, cmStdString> key =
+  std::pair<cmTarget*, std::string> key =
         std::make_pair(head, cmSystemTools::UpperCase(config ? config : ""));
   cmTargetInternals::LinkClosureMapType::iterator
     i = this->Internal->LinkClosureMap.find(key);
@@ -4467,7 +4467,7 @@ cmTarget::GetImportInfo(const char* config, cmTarget *headTarget)
     {
     config_upper = "NOCONFIG";
     }
-  std::pair<cmTarget*, cmStdString> key = std::make_pair(headTarget,
+  std::pair<cmTarget*, std::string> key = std::make_pair(headTarget,
                                                          config_upper);
   typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
@@ -4798,7 +4798,7 @@ cmTarget::LinkInterface const* cmTarget::GetLinkInterface(const char* config,
     }
 
   // Lookup any existing link interface for this configuration.
-  std::pair<cmTarget*, cmStdString> key = std::make_pair(head,
+  std::pair<cmTarget*, std::string> key = std::make_pair(head,
                                 cmSystemTools::UpperCase(config? config : ""));
 
   cmTargetInternals::LinkInterfaceMapType::iterator
@@ -4947,7 +4947,7 @@ cmTarget::GetLinkImplementation(const char* config, cmTarget *head)
     }
 
   // Lookup any existing link implementation for this configuration.
-  std::pair<cmTarget*, cmStdString> key = std::make_pair(head,
+  std::pair<cmTarget*, std::string> key = std::make_pair(head,
                                 cmSystemTools::UpperCase(config? config : ""));
 
   cmTargetInternals::LinkImplMapType::iterator
@@ -5095,9 +5095,9 @@ cmTarget::GetLinkInformation(const char* config, cmTarget *head)
 {
   cmTarget *headTarget = head ? head : this;
   // Lookup any existing information for this configuration.
-  std::pair<cmTarget*, cmStdString> key = std::make_pair(headTarget,
-                                                         config?config:"");
-  std::map<std::pair<cmTarget*, cmStdString>,
+  std::pair<cmTarget*, std::string> key = std::make_pair(headTarget,
+                                  cmSystemTools::UpperCase(config?config:""));
+  std::map<std::pair<cmTarget*, std::string>,
            cmComputeLinkInformation*>::iterator
     i = this->LinkInformation.find(key);
   if(i == this->LinkInformation.end())
@@ -5112,7 +5112,7 @@ cmTarget::GetLinkInformation(const char* config, cmTarget *head)
       }
 
     // Store the information for this configuration.
-    std::map<std::pair<cmTarget*, cmStdString>,
+    std::map<std::pair<cmTarget*, std::string>,
              cmComputeLinkInformation*>::value_type
       entry(key, info);
     i = this->LinkInformation.insert(entry).first;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 8fffc0c..d4069fa 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -28,9 +28,9 @@ class cmListFileBacktrace;
 class cmTarget;
 
 struct cmTargetLinkInformationMap:
-  public std::map<std::pair<cmTarget*, cmStdString>, cmComputeLinkInformation*>
+  public std::map<std::pair<cmTarget*, std::string>, cmComputeLinkInformation*>
 {
-  typedef std::map<std::pair<cmTarget*, cmStdString>,
+  typedef std::map<std::pair<cmTarget*, std::string>,
                    cmComputeLinkInformation*> derived;
   cmTargetLinkInformationMap() {}
   cmTargetLinkInformationMap(cmTargetLinkInformationMap const& r);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |   24 ++++++++++++------------
 Source/cmTarget.h   |    4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake