diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-12-31 13:55:42 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-01-11 16:00:55 (GMT) |
| commit | 2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2 (patch) | |
| tree | da91bed333b2625de677b27d784d44a2852656c2 | |
| parent | 4c69ec6f121f303113d2f8a158d2e53b7d93d6b4 (diff) | |
| download | CMake-2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2.zip CMake-2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2.tar.gz CMake-2f7ef7e38d7aad93f5d25efb4fd7f61468cf06a2.tar.bz2 | |
Revert "Misc. fixes for the Oracle / Sun compiler."
This reverts commit 97b65f8156734db2adc367b27c822a5fe332d740.
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 5 | ||||
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index a636d23..1fb8f30 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 8410cda..0130006 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))); } //---------------------------------------------------------------------------- |