diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2014-12-12 15:04:47 (GMT) |
|---|---|---|
| committer | Chuck Atkins <chuck.atkins@kitware.com> | 2014-12-12 15:04:47 (GMT) |
| commit | 97b65f8156734db2adc367b27c822a5fe332d740 (patch) | |
| tree | ecc985ba84634f5ddb3fab9ff1be5635406729bd /Source | |
| parent | 3171fe0afa7169c1e814a5c0e08b115002f0d3c3 (diff) | |
| download | CMake-97b65f8156734db2adc367b27c822a5fe332d740.zip CMake-97b65f8156734db2adc367b27c822a5fe332d740.tar.gz CMake-97b65f8156734db2adc367b27c822a5fe332d740.tar.bz2 | |
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 5 | ||||
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 1fb8f30..a636d23 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 0130006..8410cda 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))); } //---------------------------------------------------------------------------- |