Commit | Line | Data |
---|---|---|
3b7828cc RS |
1 | See https://groups.google.com/forum/#!topic/minisat/FCocZsC8oMQ |
2 | This seems to only be a problem with newer versions of g++, and | |
3 | upstream development seems to have stopped in 2013. | |
4 | ||
5 | diff -rupN minisat-2.2.0/core/SolverTypes.h minisat-2.2.0.patched/core/SolverTypes.h | |
6 | --- a/minisat/core/SolverTypes.h 2010-07-10 17:07:36.000000000 +0100 | |
7 | +++ b/minisat/core/SolverTypes.h 2014-03-29 11:57:49.000000000 +0000 | |
8 | @@ -47,7 +47,7 @@ struct Lit { | |
9 | int x; | |
10 | ||
11 | // Use this as a constructor: | |
12 | - friend Lit mkLit(Var var, bool sign = false); | |
13 | + //friend Lit mkLit(Var var, bool sign = false); | |
14 | ||
15 | bool operator == (Lit p) const { return x == p.x; } | |
16 | bool operator != (Lit p) const { return x != p.x; } | |
17 | @@ -55,7 +55,7 @@ struct Lit { | |
18 | }; | |
19 | ||
20 | ||
21 | -inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } | |
22 | +inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } | |
23 | inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } | |
24 | inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } | |
25 | inline bool sign (Lit p) { return p.x & 1; } |