kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Misc. fixes for the Oracle / Sun compiler." 

This reverts commit 97b65f8156.
This commit is contained in:
Stephen Kelly 2014-12-31 14:55:42 +01:00
parent 4c69ec6f12
commit 2f7ef7e38d
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmComputeLinkDepends.cxx
View File

@ -266,10 +266,9 @@ cmComputeLinkDepends::Compute()
// Iterate in reverse order so we can keep only the last occurrence // Iterate in reverse order so we can keep only the last occurrence
// of a shared library. // of a shared library.
std::set<int> emmitted; std::set<int> emmitted;
const std::vector<int>& cFLO = this->FinalLinkOrder;
for(std::vector<int>::const_reverse_iterator for(std::vector<int>::const_reverse_iterator
li = cFLO.rbegin(), li = this->FinalLinkOrder.rbegin(),
le = cFLO.rend(); le = this->FinalLinkOrder.rend();
li != le; ++li) li != le; ++li)
{ {
int i = *li; int i = *li;

15
Source/cmFindPackageCommand.cxx
View File

@ -80,15 +80,12 @@ void cmFindPackageCommand::AppendSearchPathGroups()
PathLabel::SystemRegistry); PathLabel::SystemRegistry);
// Create the new path objects // Create the new path objects
this->LabeledPaths.insert( this->LabeledPaths.insert(std::make_pair(PathLabel::UserRegistry,
std::pair<cmFindCommon::PathLabel, cmSearchPath>( cmSearchPath(this)));
PathLabel::UserRegistry, cmSearchPath(this))); this->LabeledPaths.insert(std::make_pair(PathLabel::Builds,
this->LabeledPaths.insert( cmSearchPath(this)));
std::pair<cmFindCommon::PathLabel, cmSearchPath>( this->LabeledPaths.insert(std::make_pair(PathLabel::SystemRegistry,
PathLabel::Builds, cmSearchPath(this))); cmSearchPath(this)));
this->LabeledPaths.insert(
std::pair<cmFindCommon::PathLabel, cmSearchPath>(
PathLabel::SystemRegistry, cmSearchPath(this)));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------