-
Notifications
You must be signed in to change notification settings - Fork 11
/
rareqs.patch
59 lines (52 loc) · 2.68 KB
/
rareqs.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
diff -ur rareqs-1.1/Makefile rareqs-1.1-patched/Makefile
--- rareqs-1.1/Makefile 2013-05-07 19:51:17.000000000 +0200
+++ rareqs-1.1-patched/Makefile 2017-05-31 17:42:04.000000000 +0200
@@ -24,8 +24,8 @@
endif
CFLAGS += -Wall
-CFLAGS+=-D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS -Wno-parentheses -Wno-deprecated -D _MSC_VER
-CFLAGS+=-D _MSC_VER # this is just for compilation of Options in minisat, which are not used anyhow
+CFLAGS+=-D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS -Wno-parentheses -Wno-deprecated # -D _MSC_VER
+#CFLAGS+=-D _MSC_VER # this is just for compilation of Options in minisat, which are not used anyhow
CFLAGS+=-I./minisat/
CFLAGS+=-std=c++0x
LIBS+=-lz -lminisat
diff -ur rareqs-1.1/minisat/core/SolverTypes.h rareqs-1.1-patched/minisat/core/SolverTypes.h
--- rareqs-1.1/minisat/core/SolverTypes.h 2013-05-07 19:51:18.000000000 +0200
+++ rareqs-1.1-patched/minisat/core/SolverTypes.h 2017-05-31 17:39:22.000000000 +0200
@@ -47,7 +47,7 @@
int x;
// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ Lit mkLit(Var var, bool sign);
bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -55,7 +55,7 @@
};
-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }
Only in rareqs-1.1-patched/minisat/core: SolverTypes.h-e
diff -ur rareqs-1.1/minisat/utils/Options.h rareqs-1.1-patched/minisat/utils/Options.h
--- rareqs-1.1/minisat/utils/Options.h 2013-05-07 19:51:18.000000000 +0200
+++ rareqs-1.1-patched/minisat/utils/Options.h 2017-05-31 17:42:28.000000000 +0200
@@ -282,15 +282,15 @@
if (range.begin == INT64_MIN)
fprintf(stderr, "imin");
else
- fprintf(stderr, "%4"PRIi64, range.begin);
+ fprintf(stderr, "%4" PRIi64, range.begin);
fprintf(stderr, " .. ");
if (range.end == INT64_MAX)
fprintf(stderr, "imax");
else
- fprintf(stderr, "%4"PRIi64, range.end);
+ fprintf(stderr, "%4" PRIi64, range.end);
- fprintf(stderr, "] (default: %"PRIi64")\n", value);
+ fprintf(stderr, "] (default: %" PRIi64")\n", value);
if (verbose){
fprintf(stderr, "\n %s\n", description);
fprintf(stderr, "\n");
Only in rareqs-1.1-patched: rareqs11.diff