]> git.unchartedbackwaters.co.uk Git - francis/stp.git/commit
Merge branch 'newcrypto'
authormsoos <msoos@e59a4935-1847-0410-ae03-e826735625c1>
Thu, 15 Apr 2010 12:52:17 +0000 (12:52 +0000)
committermsoos <msoos@e59a4935-1847-0410-ae03-e826735625c1>
Thu, 15 Apr 2010 12:52:17 +0000 (12:52 +0000)
commit8e6268f8ab32aeb0d96b3cefd607e41f21c795af
treef7c0fdd694fdf43e308b1abd2344fd60ed38ce99
parent2248888f7686b68aea5fd0a9669320ee1108a460
Merge branch 'newcrypto'

updated CMS2 so that segfault will no longer happen when UNSAT is found
in the middle of a varreplacement. The clause database was left in an
undefined state, which caused ~Solver to double-free some clauses

no longer be create

Conflicts:
src/sat/cryptominisat2/PartHandler.cpp
src/sat/cryptominisat2/Solver.cpp
src/sat/cryptominisat2/Solver.h
src/sat/cryptominisat2/Subsumer.cpp
src/sat/cryptominisat2/VERSION
src/sat/cryptominisat2/VarReplacer.cpp
src/sat/cryptominisat2/mtl/Vec.h

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@678 e59a4935-1847-0410-ae03-e826735625c1
src/sat/cryptominisat2/PartHandler.cpp
src/sat/cryptominisat2/Solver.cpp
src/sat/cryptominisat2/Solver.h
src/sat/cryptominisat2/Subsumer.cpp
src/sat/cryptominisat2/VERSION
src/sat/cryptominisat2/VarReplacer.cpp
src/sat/cryptominisat2/mtl/Vec.h