diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2014-12-12 15:04:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-18 16:23:41 (GMT) |
| commit | 107dcac3e03b6334a4415c0028c6111e3acb8b23 (patch) | |
| tree | fa798df10bf0e5cee5017d4d1f2da90734776030 | |
| parent | 44c6db6eb13b52683ad1b4ce49e6805cff076dfb (diff) | |
| download | CMake-107dcac3e03b6334a4415c0028c6111e3acb8b23.zip CMake-107dcac3e03b6334a4415c0028c6111e3acb8b23.tar.gz CMake-107dcac3e03b6334a4415c0028c6111e3acb8b23.tar.bz2 | |
Fix compilation with the Oracle / Sun compiler (#15318)
One piece of code has some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
Make it more explicit.
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 5 |
1 files changed, 3 insertions, 2 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; |