diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-07-08 20:06:22 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-07-08 20:06:22 +0000 |
| commit | 9f6d60cc724aa2b13867a0543fcce8edb4117bf6 (patch) | |
| tree | df56f53973417f753457c8cb161d693a5e3601c6 | |
| parent | c0dcc5ff59473a45864f818cfdda037c0ee4ea12 (diff) | |
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
| -rw-r--r-- | src/theory/uf/theory_uf_strong_solver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } } |