From 97b65f8156734db2adc367b27c822a5fe332d740 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Fri, 12 Dec 2014 10:04:47 -0500
Subject: [PATCH] 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.
---
 Source/cmComputeLinkDepends.cxx |  5 +++--
 Source/cmFindPackageCommand.cxx | 15 +++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1fb8f30f4..a636d23c7 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 0130006b7..8410cda80 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)));
 }
 
 //----------------------------------------------------------------------------