diff options
| author | Tim King <taking@google.com> | 2015-10-23 16:57:48 -0700 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2015-10-26 09:56:58 -0700 |
| commit | 918b0fd9ecde048773d245eac66eba9b4306d9d2 (patch) | |
| tree | 218d4b5aadbebd440185dc00e4f6589287326b19 /src/prop/bvminisat/simp/SimpSolver.cc | |
| parent | af86e5a8dc7a64fb5f7b4ca7bd3b2bedf5e8fe32 (diff) | |
This fixes a one definition rule violation for reduceDB_lt in Solver.cc in minisat and bvminisat. This also moves BVMinisat into CVC4. This also wrapped code in cpp files into the namespaces instead of having using namespace *.
Diffstat (limited to 'src/prop/bvminisat/simp/SimpSolver.cc')
| -rw-r--r-- | src/prop/bvminisat/simp/SimpSolver.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/prop/bvminisat/simp/SimpSolver.cc b/src/prop/bvminisat/simp/SimpSolver.cc index c65189985..e7e489985 100644 --- a/src/prop/bvminisat/simp/SimpSolver.cc +++ b/src/prop/bvminisat/simp/SimpSolver.cc @@ -23,7 +23,9 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "utils/System.h" #include "theory/bv/options.h" #include "smt/options.h" -using namespace BVMinisat; + +namespace CVC4 { +namespace BVMinisat { //================================================================================================= // Options: @@ -749,3 +751,6 @@ void SimpSolver::garbageCollect() ca.size()*ClauseAllocator::Unit_Size, to.size()*ClauseAllocator::Unit_Size); to.moveTo(ca); } + +} /* CVC4::BVMinisat namespace */ +} /* CVC4 namespace */ |