[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-482-gabf873b
Brad King
brad.king at kitware.com
Mon Nov 10 10:40:10 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via abf873b4a6c98cbdce4d7ce46ecb78bc53f65e88 (commit)
via 78c1ecb2ad1764c1bba0ae7611f5e1fcbdc711b0 (commit)
from 81deda391e459e271e14a4759838c9b6dddc37bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abf873b4a6c98cbdce4d7ce46ecb78bc53f65e88
commit abf873b4a6c98cbdce4d7ce46ecb78bc53f65e88
Merge: 81deda3 78c1ecb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 10 10:40:09 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 10 10:40:09 2014 -0500
Merge topic 'fix_link-line-dedup_regression' into next
78c1ecb2 cmComputeLinkDepends: Fix compilation on VS 7.1
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78c1ecb2ad1764c1bba0ae7611f5e1fcbdc711b0
commit 78c1ecb2ad1764c1bba0ae7611f5e1fcbdc711b0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 10 10:38:57 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:39:29 2014 -0500
cmComputeLinkDepends: Fix compilation on VS 7.1
It has trouble selecting 'operator !=' for const_reverse_iterator
when using rend() directly. Use an intermediate variable.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index f38b9bb..1fb8f30 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;
- for(std::vector<int>::const_reverse_iterator li =
- this->FinalLinkOrder.rbegin();
- li != this->FinalLinkOrder.rend(); ++li)
+ for(std::vector<int>::const_reverse_iterator
+ li = this->FinalLinkOrder.rbegin(),
+ le = this->FinalLinkOrder.rend();
+ li != le; ++li)
{
int i = *li;
LinkEntry const& e = this->EntryList[i];
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkDepends.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list