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

3 files changed, 18 insertions, 8 deletions

diff --git a/src/prop/minisat/core/Main.cc b/src/prop/minisat/core/Main.cc
index cb33d194e..64a2a1c50 100644
--- a/src/prop/minisat/core/Main.cc
+++ b/src/prop/minisat/core/Main.cc
@@ -29,11 +29,11 @@ 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/core/Solver.h"
 
-using namespace CVC4::Minisat;
-
 //=================================================================================================
 
 
+namespace CVC4 {
+namespace Minisat {
 void printStats(Solver& solver)
 {
     double cpu_time = cpuTime();
@@ -63,6 +63,9 @@ static void SIGINT_exit(int signum) {
         printf("\n"); printf("*** INTERRUPTED ***\n"); }
     _exit(1); }
 
+} /* CVC4::Minisat namespace */
+} /* CVC4 namespace */
+
 
 //=================================================================================================
 // Main:
@@ -70,6 +73,8 @@ static void SIGINT_exit(int signum) {
 
 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/core/Solver.cc b/src/prop/minisat/core/Solver.cc
index 2c94401fb..5dc618899 100644
--- a/src/prop/minisat/core/Solver.cc
+++ b/src/prop/minisat/core/Solver.cc
@@ -33,10 +33,11 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
 #include "proof/proof_manager.h"
 #include "proof/sat_proof.h"
 
-using namespace CVC4::Minisat;
-using namespace CVC4;
 using namespace CVC4::prop;
 
+namespace CVC4 {
+namespace Minisat {
+
 //=================================================================================================
 // Options:
 
@@ -332,7 +333,7 @@ bool Solver::addClause_(vec<Lit>& ps, bool removable, uint64_t proof_id)
           // as the final conflict.
           if(falseLiteralsCount == 1) {
             PROOF( ProofManager::getSatProof()->storeUnitConflict(ps[0], INPUT, proof_id); )
-            PROOF( ProofManager::getSatProof()->finalizeProof(::Minisat::CRef_Lazy); )
+            PROOF( ProofManager::getSatProof()->finalizeProof(CVC4::Minisat::CRef_Lazy); )
             return ok = false;
           }
         } else {
@@ -372,7 +373,7 @@ bool Solver::addClause_(vec<Lit>& ps, bool removable, uint64_t proof_id)
           if(! (ok = (confl == CRef_Undef)) ) {
             if(ca[confl].size() == 1) {
               PROOF( ProofManager::getSatProof()->storeUnitConflict(ca[confl][0], LEARNT, proof_id); );
-              PROOF( ProofManager::getSatProof()->finalizeProof(::Minisat::CRef_Lazy); )
+              PROOF( ProofManager::getSatProof()->finalizeProof(CVC4::Minisat::CRef_Lazy); )
             } else {
               PROOF( ProofManager::getSatProof()->finalizeProof(confl); );
             }
@@ -1729,3 +1730,7 @@ inline bool Solver::withinBudget(uint64_t ammount) const {
     (propagation_budget < 0 || propagations < (uint64_t)propagation_budget);
   return within_budget;
 }
+
+
+} /* CVC4::Minisat namespace */
+} /* CVC4 namespace */
diff --git a/src/prop/minisat/core/Solver.h b/src/prop/minisat/core/Solver.h
index 1508e3e35..b5895de6e 100644
--- a/src/prop/minisat/core/Solver.h
+++ b/src/prop/minisat/core/Solver.h
@@ -557,7 +557,7 @@ inline void     Solver::toDimacs     (const char* file, Lit p, Lit q, Lit r){ ve
 
 
 //=================================================================================================
-}/* Minisat namespace */
-}
+} /* CVC4::Minisat namespace */
+} /* CVC4 namespace */
 
 #endif