[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-763-gb167bcd

[Chuck Atkins]

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  b167bcdd568da5572fa64b1f1aa4f94c424c9073 (commit)
       via  fef5e64031e1e2834be468df3ec4eacf2b0fc9c9 (commit)
      from  6b8513cc23433ca3037560b525206aa719aa8ce0 (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=b167bcdd568da5572fa64b1f1aa4f94c424c9073
commit b167bcdd568da5572fa64b1f1aa4f94c424c9073
Merge: 6b8513c fef5e64
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 20 14:37:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 14:37:38 2014 -0500

    Merge topic 'misc-sunCC-fixes' into next
    
    fef5e640 Fix miscelaneous compile failures for sunCC


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fef5e64031e1e2834be468df3ec4eacf2b0fc9c9
commit fef5e64031e1e2834be468df3ec4eacf2b0fc9c9
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 20 13:38:44 2014 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Nov 20 13:41:40 2014 -0500

    Fix miscelaneous compile failures for sunCC
    
    cmComputeLinkDepends.cxx: Ambiguous const resolution for rbegin
    cmFindPackageCommand.cxx: Ambiguous template resolution for make_pair

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1fb8f30..d5d94cd 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -266,10 +266,9 @@ cmComputeLinkDepends::Compute()
   // Iterate in reverse order so we can keep only the last occurrence
   // of a shared library.
   std::set<int> emmitted;
-  for(std::vector<int>::const_reverse_iterator
-        li = this->FinalLinkOrder.rbegin(),
-        le = this->FinalLinkOrder.rend();
-      li != le; ++li)
+  const std::vector<int> &cFLO = this->FinalLinkOrder;
+  for(std::vector<int>::const_reverse_iterator li = cFLO.rbegin();
+      li != cFLO.rend(); ++li)
     {
     int i = *li;
     LinkEntry const& e = this->EntryList[i];
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 51f33fd..55b7c86 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -80,12 +80,15 @@ void cmFindPackageCommand::AppendSearchPathGroups()
                  PathLabel::SystemRegistry);
 
   // Create the new path objects
-  this->LabeledPaths.insert(std::make_pair(PathLabel::UserRegistry,
-    cmSearchPath(this)));
-  this->LabeledPaths.insert(std::make_pair(PathLabel::Builds,
-    cmSearchPath(this)));
-  this->LabeledPaths.insert(std::make_pair(PathLabel::SystemRegistry,
-    cmSearchPath(this)));
+  this->LabeledPaths.insert(
+    std::make_pair<cmFindCommon::PathLabel,cmSearchPath>(
+      PathLabel::UserRegistry, cmSearchPath(this)));
+  this->LabeledPaths.insert(
+    std::make_pair<cmFindCommon::PathLabel,cmSearchPath>(
+      PathLabel::Builds, cmSearchPath(this)));
+  this->LabeledPaths.insert(
+    std::make_pair<cmFindCommon::PathLabel,cmSearchPath>(
+      PathLabel::SystemRegistry, cmSearchPath(this)));
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx |    7 +++----
 Source/cmFindPackageCommand.cxx |   15 +++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake