[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-784-g50ab6ce

[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  50ab6ce2b58db2326542fcc4aa5f5f2f265394da (commit)
       via  5fa190ac3ffbdca88993c37409bd69965d835da5 (commit)
      from  c0795aa3b92fa45327819f4e624b47130c1f278e (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=50ab6ce2b58db2326542fcc4aa5f5f2f265394da
commit 50ab6ce2b58db2326542fcc4aa5f5f2f265394da
Merge: c0795aa 5fa190a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 21 10:04:06 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 21 10:04:06 2014 -0500

    Merge topic 'misc-sunCC-fixes' into next
    
    5fa190ac Revert "Fix miscelaneous compile failures for sunCC"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fa190ac3ffbdca88993c37409bd69965d835da5
commit 5fa190ac3ffbdca88993c37409bd69965d835da5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 21 10:03:52 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 21 10:03:52 2014 -0500

    Revert "Fix miscelaneous compile failures for sunCC"
    
    This reverts commit fef5e64031e1e2834be468df3ec4eacf2b0fc9c9.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index d5d94cd..1fb8f30 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 = cFLO.rbegin();
-      li != cFLO.rend(); ++li)
+  for(std::vector<int>::const_reverse_iterator
+        li = this->FinalLinkOrder.rbegin(),
+        le = this->FinalLinkOrder.rend();
+      li != le; ++li)
     {
     int i = *li;
     LinkEntry const& e = this->EntryList[i];
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 55b7c86..51f33fd 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -80,15 +80,12 @@ void cmFindPackageCommand::AppendSearchPathGroups()
                  PathLabel::SystemRegistry);
 
   // Create the new path objects
-  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)));
+  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)));
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake