diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-09-15 10:59:39 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-09-15 10:59:39 -0700 |
| commit | 50bed57caeadf3c0cb121a5b1bdc482b973f3b1f (patch) | |
| tree | 4ba17a450120b24cb0b809f1f10dbc93ab408c54 | |
| parent | 4c0b78cf7f316c475d5b7c65359b9c879bad9256 (diff) | |
| download | abc-50bed57caeadf3c0cb121a5b1bdc482b973f3b1f.tar.gz abc-50bed57caeadf3c0cb121a5b1bdc482b973f3b1f.tar.bz2 abc-50bed57caeadf3c0cb121a5b1bdc482b973f3b1f.zip | |
Changes and fixed suggested by Clifford Wolf.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/sat/bsat2/SolverTypes.h | 4 | ||||
| -rw-r--r-- | src/sat/glucose/SolverTypes.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -122,6 +122,10 @@ ifneq ($(findstring Darwin, $(shell uname)), Darwin) LIBS += -lrt endif +ifdef ABC_USE_LIBSTDCXX + LIBS += -lstdc++ + $(info $(MSG_PREFIX)Using explicit -lstdc++) +endif $(info $(MSG_PREFIX)Using CFLAGS=$(CFLAGS)) CXXFLAGS += $(CFLAGS) diff --git a/src/sat/bsat2/SolverTypes.h b/src/sat/bsat2/SolverTypes.h index ece937cb..f34deca1 100644 --- a/src/sat/bsat2/SolverTypes.h +++ b/src/sat/bsat2/SolverTypes.h @@ -47,7 +47,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; } @@ -55,7 +55,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/src/sat/glucose/SolverTypes.h b/src/sat/glucose/SolverTypes.h index 78bc7d94..2f0796c9 100644 --- a/src/sat/glucose/SolverTypes.h +++ b/src/sat/glucose/SolverTypes.h @@ -55,14 +55,14 @@ 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; } bool operator < (Lit p) const { return x < p.x; } // '<' makes p, ~p adjacent in the ordering. }; -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; } |