[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1134-g1ba345d

[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  1ba345dcbfa22e7404acc82238fed14757255fe4 (commit)
       via  97b65f8156734db2adc367b27c822a5fe332d740 (commit)
      from  515f2331dc203f56b4c4e7eb2703298ba1116a7d (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=1ba345dcbfa22e7404acc82238fed14757255fe4
commit 1ba345dcbfa22e7404acc82238fed14757255fe4
Merge: 515f233 97b65f8
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Dec 12 10:15:12 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 10:15:12 2014 -0500

    Merge topic 'suncc-fixes' into next
    
    97b65f81 Misc. fixes for the Oracle / Sun compiler.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97b65f8156734db2adc367b27c822a5fe332d740
commit 97b65f8156734db2adc367b27c822a5fe332d740
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Dec 12 10:04:47 2014 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Dec 12 10:04:47 2014 -0500

    Misc. fixes for the Oracle / Sun compiler.
    
    A few pieces of code have some ambiguous type deduction that seems to
    resolve correctly for most compilers but not for the Oracle compiler.
    This makes those few instances more explicit.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1fb8f30..a636d23 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -266,9 +266,10 @@ cmComputeLinkDepends::Compute()
   // Iterate in reverse order so we can keep only the last occurrence
   // of a shared library.
   std::set<int> emmitted;
+  const std::vector<int>& cFLO = this->FinalLinkOrder;
   for(std::vector<int>::const_reverse_iterator
-        li = this->FinalLinkOrder.rbegin(),
-        le = this->FinalLinkOrder.rend();
+        li = cFLO.rbegin(),
+        le = cFLO.rend();
       li != le; ++li)
     {
     int i = *li;
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 0130006..8410cda 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::pair<cmFindCommon::PathLabel, cmSearchPath>(
+      PathLabel::UserRegistry, cmSearchPath(this)));
+  this->LabeledPaths.insert(
+    std::pair<cmFindCommon::PathLabel, cmSearchPath>(
+      PathLabel::Builds, cmSearchPath(this)));
+  this->LabeledPaths.insert(
+    std::pair<cmFindCommon::PathLabel, cmSearchPath>(
+      PathLabel::SystemRegistry, cmSearchPath(this)));
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake