From 2d316b86e29704c28487533518bf67f2672fcd8f Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Fri, 17 Feb 2012 00:06:39 -0800 Subject: Silencing some of the gcc warnings. --- src/sat/bsat/satSolver2.c | 4 ++-- src/sat/msat/msatOrderH.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/sat') diff --git a/src/sat/bsat/satSolver2.c b/src/sat/bsat/satSolver2.c index a02ecc3f..80268a73 100644 --- a/src/sat/bsat/satSolver2.c +++ b/src/sat/bsat/satSolver2.c @@ -331,8 +331,8 @@ static inline void act_var_rescale(sat_solver2* s) { s->var_inc = Abc_MaxInt( s->var_inc, (1<<4) ); } static inline void act_clause_rescale(sat_solver2* s) { - static int Total = 0; - int i, clk = clock(); +// static int Total = 0; + int i;//, clk = clock(); unsigned * claActs = (unsigned *)veci_begin(&s->claActs); for (i = 1; i < veci_size(&s->claActs); i++) claActs[i] >>= 14; diff --git a/src/sat/msat/msatOrderH.c b/src/sat/msat/msatOrderH.c index 61c4d4d3..4bdefc6d 100644 --- a/src/sat/msat/msatOrderH.c +++ b/src/sat/msat/msatOrderH.c @@ -282,10 +282,11 @@ 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))) ) && + ( HPARENT(i) == 0 || !HCOMPARE(p, HHEAP(p, i), HHEAP(p, HPARENT(i))) ) && + Msat_HeapCheck_rec( p, HLEFT(i) ) && + Msat_HeapCheck_rec( p, HRIGHT(i) ) ); } -- cgit v1.2.3