Minor changes to avoid some warnings on GCC 4.7.1 (Debian wheezy/sid). ANDY - please...
authorMorgan Deters <mdeters@gmail.com>
Sun, 8 Jul 2012 20:06:22 +0000 (20:06 +0000)
committerMorgan Deters <mdeters@gmail.com>
Sun, 8 Jul 2012 20:06:22 +0000 (20:06 +0000)
src/theory/uf/theory_uf_strong_solver.cpp

index 9d9be60e3b39cfadb9b078795f1929934da73def..ebbbb139d72a33ea482dda5c8968d1d01eb6728b 100644 (file)
@@ -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;
       }
     }