[SCM] grounding tools for (disjunctive) logic programs branch, master, updated. 4f811237c40819e8376aae1f1e72c4e5443e1aed
Thomas Krennwallner
tkren at kr.tuwien.ac.at
Tue Apr 10 14:54:19 UTC 2012
The following commit has been merged in the master branch:
commit f5b1cd580ae57fa8333d89ccb581572e58b65f80
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Tue Apr 10 15:34:39 2012 +0200
Refresh quilt patch.
diff --git a/debian/patches/gringo-clang-gcc.patch b/debian/patches/gringo-clang-gcc.patch
index 87c0597..e103af4 100644
--- a/debian/patches/gringo-clang-gcc.patch
+++ b/debian/patches/gringo-clang-gcc.patch
@@ -5,48 +5,30 @@ Origin: upstream, https://potassco.svn.sourceforge.net/svnroot/potassco/tags/gri
Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
Last-Update: 2012-03-01
-Index: libgringo/gringo/term.h
+Index: gringo-3.0.4-source/libgringo/gringo/aggrlit.h
===================================================================
---- libgringo/gringo/term.h (revision 5216)
-+++ libgringo/gringo/term.h (working copy)
-@@ -64,8 +64,11 @@
- virtual ~Term() { }
+--- gringo-3.0.4-source.orig/libgringo/gringo/aggrlit.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/aggrlit.h 2012-04-10 15:31:39.000000000 +0200
+@@ -118,9 +118,13 @@
+ clone_ptr<Term> weight_;
};
--inline Term* new_clone(const Term& a)
+-inline WeightLit* new_clone(const WeightLit& a)
+namespace boost
{
-- return a.clone();
+- return static_cast<WeightLit*>(a.clone());
+ template <>
-+ inline Term* new_clone(const Term& a)
++ inline WeightLit* new_clone(const WeightLit& a)
+ {
-+ return a.clone();
++ return static_cast<WeightLit*>(a.clone());
+ }
}
--
-Index: libgringo/gringo/varterm.h
-===================================================================
---- libgringo/gringo/varterm.h (revision 5216)
-+++ libgringo/gringo/varterm.h (working copy)
-@@ -45,8 +45,11 @@
- uint32_t local_ : 1;
- };
--inline VarTerm* new_clone(const VarTerm& a)
-+namespace boost
- {
-- return static_cast<VarTerm*>(a.clone());
-+ template<>
-+ inline VarTerm* new_clone(const VarTerm& a)
-+ {
-+ return static_cast<VarTerm*>(a.clone());
-+ }
- }
--
-Index: libgringo/gringo/clone_ptr.h
+ class CondLit : public Groundable, public Locateable
+Index: gringo-3.0.4-source/libgringo/gringo/clone_ptr.h
===================================================================
---- libgringo/gringo/clone_ptr.h (revision 5216)
-+++ libgringo/gringo/clone_ptr.h (working copy)
+--- gringo-3.0.4-source.orig/libgringo/gringo/clone_ptr.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/clone_ptr.h 2012-04-10 15:31:39.000000000 +0200
@@ -17,6 +17,8 @@
#pragma once
@@ -65,84 +47,10 @@ Index: libgringo/gringo/clone_ptr.h
{
}
-Index: libgringo/gringo/aggrlit.h
-===================================================================
---- libgringo/gringo/aggrlit.h (revision 5216)
-+++ libgringo/gringo/aggrlit.h (working copy)
-@@ -118,9 +118,13 @@
- clone_ptr<Term> weight_;
- };
-
--inline WeightLit* new_clone(const WeightLit& a)
-+namespace boost
- {
-- return static_cast<WeightLit*>(a.clone());
-+ template <>
-+ inline WeightLit* new_clone(const WeightLit& a)
-+ {
-+ return static_cast<WeightLit*>(a.clone());
-+ }
- }
-
- class CondLit : public Groundable, public Locateable
-Index: libgringo/gringo/parser.h
-===================================================================
---- libgringo/gringo/parser.h (revision 5216)
-+++ libgringo/gringo/parser.h (working copy)
-@@ -21,6 +21,7 @@
- #include <gringo/lexer_impl.h>
- #include <gringo/locateable.h>
- #include <gringo/optimize.h>
-+#include <gringo/domain.h>
-
- class Parser : public LexerImpl
- {
-Index: libgringo/gringo/instantiator.h
-===================================================================
---- libgringo/gringo/instantiator.h (revision 5216)
-+++ libgringo/gringo/instantiator.h (working copy)
-@@ -35,9 +35,12 @@
- IntVec new_;
- };
-
--inline Instantiator* new_clone(const Instantiator& a)
-+namespace boost
- {
-- (void)a;
-- return 0;
-+ template <>
-+ inline Instantiator* new_clone(const Instantiator& a)
-+ {
-+ (void)a;
-+ return 0;
-+ }
- }
--
-Index: libgringo/gringo/litdep.h
-===================================================================
---- libgringo/gringo/litdep.h (revision 5216)
-+++ libgringo/gringo/litdep.h (working copy)
-@@ -113,9 +113,12 @@
- };
- }
-
--inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
-+namespace boost
- {
-- (void)a;
-- return 0;
-+ template <>
-+ inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
-+ {
-+ (void)a;
-+ return 0;
-+ }
- }
--
-Index: libgringo/gringo/gringo.h
+Index: gringo-3.0.4-source/libgringo/gringo/gringo.h
===================================================================
---- libgringo/gringo/gringo.h (revision 5216)
-+++ libgringo/gringo/gringo.h (working copy)
+--- gringo-3.0.4-source.orig/libgringo/gringo/gringo.h 2012-01-26 13:02:17.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/gringo.h 2012-04-10 15:31:39.000000000 +0200
@@ -76,7 +76,6 @@
class Instantiator;
class Lexer;
@@ -191,10 +99,31 @@ Index: libgringo/gringo/gringo.h
+}
#endif
-Index: libgringo/gringo/lit.h
+Index: gringo-3.0.4-source/libgringo/gringo/instantiator.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/instantiator.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/instantiator.h 2012-04-10 15:31:39.000000000 +0200
+@@ -35,9 +35,12 @@
+ IntVec new_;
+ };
+
+-inline Instantiator* new_clone(const Instantiator& a)
++namespace boost
+ {
+- (void)a;
+- return 0;
++ template <>
++ inline Instantiator* new_clone(const Instantiator& a)
++ {
++ (void)a;
++ return 0;
++ }
+ }
+-
+Index: gringo-3.0.4-source/libgringo/gringo/lit.h
===================================================================
---- libgringo/gringo/lit.h (revision 5216)
-+++ libgringo/gringo/lit.h (working copy)
+--- gringo-3.0.4-source.orig/libgringo/gringo/lit.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/lit.h 2012-04-10 15:31:39.000000000 +0200
@@ -73,8 +73,11 @@
bool head_;
};
@@ -210,10 +139,31 @@ Index: libgringo/gringo/lit.h
+ }
}
-
-Index: libgringo/gringo/optimize.h
+Index: gringo-3.0.4-source/libgringo/gringo/litdep.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/litdep.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/litdep.h 2012-04-10 15:31:39.000000000 +0200
+@@ -113,9 +113,12 @@
+ };
+ }
+
+-inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
++namespace boost
+ {
+- (void)a;
+- return 0;
++ template <>
++ inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
++ {
++ (void)a;
++ return 0;
++ }
+ }
+-
+Index: gringo-3.0.4-source/libgringo/gringo/optimize.h
===================================================================
---- libgringo/gringo/optimize.h (revision 5216)
-+++ libgringo/gringo/optimize.h (working copy)
+--- gringo-3.0.4-source.orig/libgringo/gringo/optimize.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/optimize.h 2012-04-10 15:31:39.000000000 +0200
@@ -26,10 +26,9 @@
class Optimize : public Statement
@@ -237,10 +187,60 @@ Index: libgringo/gringo/optimize.h
+ Optimize::PrioLit* new_clone(const Optimize::PrioLit& a);
+}
-Index: libgringo/src/aggrlit.cpp
+Index: gringo-3.0.4-source/libgringo/gringo/parser.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/parser.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/parser.h 2012-04-10 15:31:39.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <gringo/lexer_impl.h>
+ #include <gringo/locateable.h>
+ #include <gringo/optimize.h>
++#include <gringo/domain.h>
+
+ class Parser : public LexerImpl
+ {
+Index: gringo-3.0.4-source/libgringo/gringo/term.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/term.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/term.h 2012-04-10 15:31:39.000000000 +0200
+@@ -64,8 +64,11 @@
+ virtual ~Term() { }
+ };
+
+-inline Term* new_clone(const Term& a)
++namespace boost
+ {
+- return a.clone();
++ template <>
++ inline Term* new_clone(const Term& a)
++ {
++ return a.clone();
++ }
+ }
+-
+Index: gringo-3.0.4-source/libgringo/gringo/varterm.h
+===================================================================
+--- gringo-3.0.4-source.orig/libgringo/gringo/varterm.h 2012-01-26 12:11:43.000000000 +0100
++++ gringo-3.0.4-source/libgringo/gringo/varterm.h 2012-04-10 15:31:39.000000000 +0200
+@@ -45,8 +45,11 @@
+ uint32_t local_ : 1;
+ };
+
+-inline VarTerm* new_clone(const VarTerm& a)
++namespace boost
+ {
+- return static_cast<VarTerm*>(a.clone());
++ template<>
++ inline VarTerm* new_clone(const VarTerm& a)
++ {
++ return static_cast<VarTerm*>(a.clone());
++ }
+ }
+-
+Index: gringo-3.0.4-source/libgringo/src/aggrlit.cpp
===================================================================
---- libgringo/src/aggrlit.cpp (revision 5216)
-+++ libgringo/src/aggrlit.cpp (working copy)
+--- gringo-3.0.4-source.orig/libgringo/src/aggrlit.cpp 2012-01-26 12:11:44.000000000 +0100
++++ gringo-3.0.4-source/libgringo/src/aggrlit.cpp 2012-04-10 15:31:39.000000000 +0200
@@ -337,8 +337,11 @@
{
}
diff --git a/debian/patches/series b/debian/patches/series
index 2d26c32..41c5775 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-gringo-clang-gcc.patch
gringo-domain-fwd-decl.patch
gringo-manpages.patch
+gringo-clang-gcc.patch
--
grounding tools for (disjunctive) logic programs
More information about the debian-science-commits
mailing list