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 *.

2 files changed, 11 insertions, 4 deletions

diff --git a/src/prop/minisat/simp/Main.cc b/src/prop/minisat/simp/Main.cc
index ff0f589cd..675d0ed60 100644
--- a/src/prop/minisat/simp/Main.cc
+++ b/src/prop/minisat/simp/Main.cc
@@ -30,11 +30,12 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include "prop/minisat/core/Dimacs.h"
 #include "prop/minisat/simp/SimpSolver.h"
 
-using namespace Minisat;
-
 //=================================================================================================
 
 
+namespace CVC4 {
+namespace Minisat {
+
 void printStats(Solver& solver)
 {
     double cpu_time = cpuTime();
@@ -49,6 +50,8 @@ void printStats(Solver& solver)
 }
 
 
+
+
 static Solver* solver;
 // Terminate by notifying the solver and back out gracefully. This is mainly to have a test-case
 // for this feature of the Solver as it may take longer than an immediate call to '_exit()'.
@@ -64,12 +67,16 @@ static void SIGINT_exit(int signum) {
         printf("\n"); printf("*** INTERRUPTED ***\n"); }
     _exit(1); }
 
+} /* CVC4::Minisat namespace */
+} /* CVC4 namespace */
 
 //=================================================================================================
 // Main:
 
 int main(int argc, char** argv)
 {
+  using namespace CVC4;
+  using namespace CVC4::Minisat;
     try {
         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
         // printf("This is MiniSat 2.0 beta\n");
diff --git a/src/prop/minisat/simp/SimpSolver.h b/src/prop/minisat/simp/SimpSolver.h
index 370304d22..0c5062726 100644
--- a/src/prop/minisat/simp/SimpSolver.h
+++ b/src/prop/minisat/simp/SimpSolver.h
@@ -235,7 +235,7 @@ inline lbool SimpSolver::solveLimited (const vec<Lit>& assumps, bool do_simp, bo
     assumps.copyTo(assumptions); return solve_(do_simp, turn_off_simp); }
 
 //=================================================================================================
-}
-}
+} /* CVC4::Minisat namespace */
+} /* CVC4 namespace */
 
 #endif