Merge branch 'backport-suncc-fixes' into release

This commit is contained in:
Brad King 2014-12-22 10:00:03 -05:00
commit 9755fd0e6c

View File

@ -266,9 +266,10 @@ 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 = this->FinalLinkOrder.rbegin(), li = cFLO.rbegin(),
le = this->FinalLinkOrder.rend(); le = cFLO.rend();
li != le; ++li) li != le; ++li)
{ {
int i = *li; int i = *li;