[klee-commits] [1490] silenced some compiler warnings

[sbkim at stanford.edu]

Revision: 1490
          http://keeda.stanford.edu/viewvc/viewvc.cgi?view=rev&revision=1490
Author:   sbkim
Date:     2009-03-06 15:10:47 -0800 (Fri, 06 Mar 2009)
Log Message:
-----------
silenced some compiler warnings

Modified Paths:
--------------
    stp/parser/main.cpp
    stp/sat/Simplifier.C
    stp/sat/Solver.C
    stp/simplifier/simplifier.cpp

Modified: stp/parser/main.cpp
===================================================================
--- stp/parser/main.cpp	2009-03-06 22:57:16 UTC (rev 1489)
+++ stp/parser/main.cpp	2009-03-06 23:10:47 UTC (rev 1490)
@@ -38,7 +38,7 @@
  */
 const char * prog = "stp";
 int linenum  = 1;
-char * usage = "Usage: %s [-option] [infile]\n";
+const char * usage = "Usage: %s [-option] [infile]\n";
 std::string helpstring = "\n\n";
 
 // Amount of memory to ask for at beginning of main.

Modified: stp/sat/Simplifier.C
===================================================================
--- stp/sat/Simplifier.C	2009-03-06 22:57:16 UTC (rev 1489)
+++ stp/sat/Simplifier.C	2009-03-06 23:10:47 UTC (rev 1490)
@@ -95,11 +95,12 @@
     for (int i = 0; i < qs.size(); i++){
         if (var(qs[i]) != v){
             for (int j = 0; j < ps.size(); j++)
-                if (var(ps[j]) == var(qs[i]))
+                if (var(ps[j]) == var(qs[i])) {
                     if (ps[j] == ~qs[i])
                         return false;
                     else
                         goto next;
+                }
             out_clause.push(qs[i]);
         }
         next:;

Modified: stp/sat/Solver.C
===================================================================
--- stp/sat/Solver.C	2009-03-06 22:57:16 UTC (rev 1489)
+++ stp/sat/Solver.C	2009-03-06 23:10:47 UTC (rev 1490)
@@ -576,7 +576,7 @@
         return ok = false;
 
     if (nAssigns() == simpDB_assigns || 
-        !subsumption && simpDB_props > 0)   // (nothing has changed or preformed a simplification too recently)
+        (!subsumption && simpDB_props > 0)) // (nothing has changed or preformed a simplification too recently)
         return true;
 
     if (subsumption){

Modified: stp/simplifier/simplifier.cpp
===================================================================
--- stp/simplifier/simplifier.cpp	2009-03-06 22:57:16 UTC (rev 1489)
+++ stp/simplifier/simplifier.cpp	2009-03-06 23:10:47 UTC (rev 1490)
@@ -733,8 +733,8 @@
       a1 = output[1];
       if(a0 == a1)
 	output = ASTFalse;
-      else if(a0 == ASTTrue  && a1 == ASTFalse ||
-	      a0 == ASTFalse && a1 == ASTTrue)
+      else if((a0 == ASTTrue  && a1 == ASTFalse) ||
+	      (a0 == ASTFalse && a1 == ASTTrue))
 	output = ASTTrue;
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://keeda.Stanford.EDU/pipermail/klee-commits/attachments/20090306/33a5ee3b/attachment.html