From 2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Wed, 31 Dec 2014 14:55:42 +0100
Subject: [PATCH] Revert "Misc. fixes for the Oracle / Sun compiler."

This reverts commit 97b65f8156734db2adc367b27c822a5fe332d740.
---
 Source/cmComputeLinkDepends.cxx |  5 ++---
 Source/cmFindPackageCommand.cxx | 15 ++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index a636d23c7..1fb8f30f4 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;
-  const std::vector<int>& cFLO = this->FinalLinkOrder;
   for(std::vector<int>::const_reverse_iterator
-        li = cFLO.rbegin(),
-        le = cFLO.rend();
+        li = this->FinalLinkOrder.rbegin(),
+        le = this->FinalLinkOrder.rend();
       li != le; ++li)
     {
     int i = *li;
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 8410cda80..0130006b7 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::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)));
+  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)));
 }
 
 //----------------------------------------------------------------------------