diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-04-20 14:17:40 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-04-20 14:17:40 +0200 |
| commit | d2d48996c4d6a81226f5dbdb8c6acf108ce26a5b (patch) | |
| tree | a29dbcf67569f1fb8dbeba79f64ef17a6ca234bd /libs/minisat | |
| parent | 12a3c05229a958a4ff3fb8ad782ceb28bab6dca1 (diff) | |
| download | yosys-d2d48996c4d6a81226f5dbdb8c6acf108ce26a5b.tar.gz yosys-d2d48996c4d6a81226f5dbdb8c6acf108ce26a5b.tar.bz2 yosys-d2d48996c4d6a81226f5dbdb8c6acf108ce26a5b.zip | |
minisat compile fix
Diffstat (limited to 'libs/minisat')
| -rw-r--r-- | libs/minisat/PATCH_mkLit_default_arg.patch | 20 | ||||
| -rw-r--r-- | libs/minisat/SolverTypes.h | 4 | ||||
| -rw-r--r-- | libs/minisat/UPDATE.sh | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/libs/minisat/PATCH_mkLit_default_arg.patch b/libs/minisat/PATCH_mkLit_default_arg.patch new file mode 100644 index 000000000..e21683f98 --- /dev/null +++ b/libs/minisat/PATCH_mkLit_default_arg.patch @@ -0,0 +1,20 @@ +--- SolverTypes.h ++++ SolverTypes.h +@@ -52,7 +52,7 @@ struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ friend Lit mkLit(Var var, bool sign); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -60,7 +60,7 @@ struct Lit { + }; + + +-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; } diff --git a/libs/minisat/SolverTypes.h b/libs/minisat/SolverTypes.h index be40a4c37..a47c2ce83 100644 --- a/libs/minisat/SolverTypes.h +++ b/libs/minisat/SolverTypes.h @@ -52,7 +52,7 @@ struct Lit { int x; // Use this as a constructor: - friend Lit mkLit(Var var, bool sign = false); + friend Lit mkLit(Var var, bool sign); bool operator == (Lit p) const { return x == p.x; } bool operator != (Lit p) const { return x != p.x; } @@ -60,7 +60,7 @@ struct Lit { }; -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; } diff --git a/libs/minisat/UPDATE.sh b/libs/minisat/UPDATE.sh index a84290279..68c7c60ee 100644 --- a/libs/minisat/UPDATE.sh +++ b/libs/minisat/UPDATE.sh @@ -11,3 +11,6 @@ sed -i -e 's/Minisat::memUsedPeak()/Minisat::memUsedPeak(bool)/' System.cc sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc + +patch -p0 < PATCH_mkLit_default_arg.patch + |