[Cmake-commits] CMake branch, next, updated. v3.1.0-1346-g5e6b618

[Brad King]

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  5e6b61862fa0a1bca328c690b0d7a24085688f7d (commit)
       via  107dcac3e03b6334a4415c0028c6111e3acb8b23 (commit)
      from  7d315d7e39a710fdf03b07388b4eec105a22e565 (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=5e6b61862fa0a1bca328c690b0d7a24085688f7d
commit 5e6b61862fa0a1bca328c690b0d7a24085688f7d
Merge: 7d315d7 107dcac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 14:25:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 22 14:25:41 2014 -0500

    Merge topic 'backport-suncc-fixes' into next
    
    107dcac3 Fix compilation with the Oracle / Sun compiler (#15318)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=107dcac3e03b6334a4415c0028c6111e3acb8b23
commit 107dcac3e03b6334a4415c0028c6111e3acb8b23
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Dec 12 10:04:47 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 11:23:41 2014 -0500

    Fix compilation with the Oracle / Sun compiler (#15318)
    
    One piece of code has some ambiguous type deduction that seems to
    resolve correctly for most compilers but not for the Oracle compiler.
    Make it 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;

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

Summary of changes:


hooks/post-receive
-- 
CMake