From: Morgan Deters Date: Sun, 8 Jul 2012 20:06:22 +0000 (+0000) Subject: Minor changes to avoid some warnings on GCC 4.7.1 (Debian wheezy/sid). ANDY - please... X-Git-Tag: cvc5-1.0.0~7946 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f6d60cc724aa2b13867a0543fcce8edb4117bf6;p=cvc5.git Minor changes to avoid some warnings on GCC 4.7.1 (Debian wheezy/sid). ANDY - please look at the diff and make sure I didn't do something stupid --- diff --git a/src/theory/uf/theory_uf_strong_solver.cpp b/src/theory/uf/theory_uf_strong_solver.cpp index 9d9be60e3..ebbbb139d 100644 --- a/src/theory/uf/theory_uf_strong_solver.cpp +++ b/src/theory/uf/theory_uf_strong_solver.cpp @@ -463,7 +463,7 @@ void StrongSolverTheoryUf::ConflictFind::getDisequalitiesToRegions( int ri, std: void StrongSolverTheoryUf::ConflictFind::explainClique( std::vector< Node >& clique, OutputChannel* out ){ Assert( d_cardinality>0 ); - while( clique.size()>long(d_cardinality+1) ){ + while( clique.size()>size_t(d_cardinality+1) ){ clique.pop_back(); } //found a clique @@ -490,7 +490,7 @@ void StrongSolverTheoryUf::ConflictFind::explainClique( std::vector< Node >& cli conflict.push_back( d_disequalities[i] ); nodesWithinRep[r1][ d_disequalities[i][0][0] ] = true; nodesWithinRep[r2][ d_disequalities[i][0][1] ] = true; - if( conflict.size()==((int)clique.size()*( (int)clique.size()-1 )/2) ){ + if( conflict.size()==(clique.size()*( clique.size()-1 )/2) ){ break; } }