Updating CMS2 to r686

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@543 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/src/sat/cryptominisat2/Solver.cpp b/src/sat/cryptominisat2/Solver.cpp
index cdc0016077b36ae98a773ac8b49a8e11cfd3102e..0748cfdda5ae869252ca543ceae940fce4c9db7d 100644 (file)
--- a/src/sat/cryptominisat2/Solver.cpp
+++ b/src/sat/cryptominisat2/Solver.cpp
@@ -398,7 +398,7 @@ void Solver::cancelUntil(int level)
         for (Gaussian **gauss = &gauss_matrixes[0], **end= gauss + gauss_matrixes.size(); gauss != end; gauss++)
             (*gauss)->canceling(trail_lim[level]);
         
-        for (int c = trail.size()-1; c >= trail_lim[level]; c--) {
+        for (int c = trail.size()-1; c >= (int)trail_lim[level]; c--) {
             Var     x  = trail[c].var();
             #ifdef VERBOSE_DEBUG
             cout << "Canceling var " << x+1 << " sublevel: " << c << endl;

diff --git a/src/sat/cryptominisat2/VERSION b/src/sat/cryptominisat2/VERSION
index 6421488e52d43a7cf36fffb7908333f49b04f2ab..c0069382a504bc482592446639a57034c046875a 100644 (file)
--- a/src/sat/cryptominisat2/VERSION
+++ b/src/sat/cryptominisat2/VERSION
@@ -1,3 +1,3 @@
 CryptoMiniSat
-SVN revision: 685
-GIT revision: 4c03a6cf5a46679d144b5f68cb454c1f62b0c60c
+SVN revision: 686
+GIT revision: 30b79471e85e0dde20440ea5c51c78246d14c8ab