[clasp] 02/04: Remove g++5 patch introduced in clasp 3.1.3-2

[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 aea4f04946653ac9b0da05bb866d9281e6d9cbbb
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Dec 19 13:59:10 2015 +0100

    Remove g++5 patch introduced in clasp 3.1.3-2
---
 debian/patches/clasp-g++5.patch | 21 ---------------------
 debian/patches/series           |  1 -
 2 files changed, 22 deletions(-)

diff --git a/debian/patches/clasp-g++5.patch b/debian/patches/clasp-g++5.patch
deleted file mode 100644
index d368b31..0000000
--- a/debian/patches/clasp-g++5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 5486933..b31f497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-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