diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-02-16 23:40:23 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-02-16 23:40:23 -0800 |
| commit | 97856d021a1282cf3fb9a86701fff3ec403fe912 (patch) | |
| tree | 7dbd5471eb417540ad39fa6079ac8c32a2e06222 /src/sat/msat | |
| parent | 791b107e7a225103ee76c921c3c4a96d0e1adae2 (diff) | |
| download | abc-97856d021a1282cf3fb9a86701fff3ec403fe912.tar.gz abc-97856d021a1282cf3fb9a86701fff3ec403fe912.tar.bz2 abc-97856d021a1282cf3fb9a86701fff3ec403fe912.zip | |
Silencing some of the gcc warnings.
Diffstat (limited to 'src/sat/msat')
| -rw-r--r-- | src/sat/msat/msatOrderH.c | 8 | ||||
| -rw-r--r-- | src/sat/msat/msatSolverCore.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/sat/msat/msatOrderH.c b/src/sat/msat/msatOrderH.c index 2904607f..61c4d4d3 100644 --- a/src/sat/msat/msatOrderH.c +++ b/src/sat/msat/msatOrderH.c @@ -282,8 +282,12 @@ timeSelect += clock() - clk; int Msat_HeapCheck_rec( Msat_Order_t * p, int i ) { return i >= HSIZE(p) || - ( HPARENT(i) == 0 || !HCOMPARE(p, HHEAP(p, i), HHEAP(p, HPARENT(i))) ) && - Msat_HeapCheck_rec( p, HLEFT(i) ) && Msat_HeapCheck_rec( p, HRIGHT(i) ); + ( HPARENT(i) == 0 || + ( + !HCOMPARE(p, HHEAP(p, i), HHEAP(p, HPARENT(i))) ) && + Msat_HeapCheck_rec( p, HLEFT(i) ) && + Msat_HeapCheck_rec( p, HRIGHT(i) ) + ); } /**Function************************************************************* diff --git a/src/sat/msat/msatSolverCore.c b/src/sat/msat/msatSolverCore.c index 3312c23d..4ef40ad0 100644 --- a/src/sat/msat/msatSolverCore.c +++ b/src/sat/msat/msatSolverCore.c @@ -111,11 +111,11 @@ void Msat_SolverPrintStats( Msat_Solver_t * p ) { printf("C solver (%d vars; %d clauses; %d learned):\n", p->nVars, Msat_ClauseVecReadSize(p->vClauses), Msat_ClauseVecReadSize(p->vLearned) ); - printf("starts : %lld\n", p->Stats.nStarts); - printf("conflicts : %lld\n", p->Stats.nConflicts); - printf("decisions : %lld\n", p->Stats.nDecisions); - printf("propagations : %lld\n", p->Stats.nPropagations); - printf("inspects : %lld\n", p->Stats.nInspects); + printf("starts : %d\n", (int)p->Stats.nStarts); + printf("conflicts : %d\n", (int)p->Stats.nConflicts); + printf("decisions : %d\n", (int)p->Stats.nDecisions); + printf("propagations : %d\n", (int)p->Stats.nPropagations); + printf("inspects : %d\n", (int)p->Stats.nInspects); } /**Function************************************************************* |