[clasp] 02/02: Circumvent g++-5 loop code generation bug.

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 5ece41ece9e40cb95950a09cfbfb34b9c3a64505
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon Oct 5 07:28:21 2015 +0200

    Circumvent g++-5 loop code generation bug.
---
 debian/patches/clasp-g++5.patch | 21 +++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/clasp-g++5.patch b/debian/patches/clasp-g++5.patch
new file mode 100644
index 0000000..d368b31
--- /dev/null
+++ b/debian/patches/clasp-g++5.patch
@@ -0,0 +1,21 @@
+Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
+Description: Circumvent g++-5 loop code generation bug.
+Origin: upstream, http://sourceforge.net/p/potassco/mailman/message/34512643/
+Forwarded: not-needed
+Bug: http://sourceforge.net/p/potassco/mailman/message/34487825/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800526
+Index: clasp-git-gbp/libclasp/src/clause.cpp
+===================================================================
+--- clasp-git-gbp.orig/libclasp/src/clause.cpp
++++ clasp-git-gbp/libclasp/src/clause.cpp
+@@ -472,7 +472,9 @@ uint32 Clause::computeAllocSize() const
+ bool Clause::updateWatch(Solver& s, uint32 pos) {
+ 	uint32 idx = data_.local.idx;
+ 	if (!isSmall()) {
+-		for (Literal* tailS = head_ + ClauseHead::HEAD_LITS, *end = longEnd();;) {
++        while (true) {
++            Literal* tailS = head_ + ClauseHead::HEAD_LITS;
++            Literal* end = longEnd();
+ 			for (Literal* it  = tailS + idx; it < end; ++it) {
+ 				if (!s.isFalse(*it)) {
+ 					std::swap(*it, head_[pos]);
diff --git a/debian/patches/series b/debian/patches/series
index b31f497..5486933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+clasp-g++5.patch
 clasp-manpage.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git