From af9a90a1b3df29f7955d255aff1fd26e9957018d Mon Sep 17 00:00:00 2001
From: Tim King <taking@cs.nyu.edu>
Date: Thu, 29 Mar 2012 19:38:42 +0000
Subject: [PATCH] Fixes a linking problem with the new SatSolverConstructor on
 Mac.

---
 src/prop/bvminisat/bvminisat.h  | 2 --
 src/prop/minisat/minisat.h      | 2 --
 src/prop/sat_solver_factory.cpp | 9 +++++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/prop/bvminisat/bvminisat.h b/src/prop/bvminisat/bvminisat.h
index d192b34b7..4ca1164c0 100644
--- a/src/prop/bvminisat/bvminisat.h
+++ b/src/prop/bvminisat/bvminisat.h
@@ -79,8 +79,6 @@ public:
   Statistics d_statistics;
 };
 
-template class SatSolverConstructor<BVMinisatSatSolver>;
-
 }
 }
 
diff --git a/src/prop/minisat/minisat.h b/src/prop/minisat/minisat.h
index 3bd690cc7..9cf75a12e 100644
--- a/src/prop/minisat/minisat.h
+++ b/src/prop/minisat/minisat.h
@@ -96,8 +96,6 @@ public:
 
 };
 
-template class SatSolverConstructor<MinisatSatSolver>;
-
 } // prop namespace
 } // cvc4 namespace
 
diff --git a/src/prop/sat_solver_factory.cpp b/src/prop/sat_solver_factory.cpp
index fa787451d..e6ae5d1e7 100644
--- a/src/prop/sat_solver_factory.cpp
+++ b/src/prop/sat_solver_factory.cpp
@@ -21,8 +21,11 @@
 #include "prop/minisat/minisat.h"
 #include "prop/bvminisat/bvminisat.h"
 
-using namespace CVC4;
-using namespace prop;
+namespace CVC4 {
+namespace prop {
+
+template class SatSolverConstructor<MinisatSatSolver>;
+template class SatSolverConstructor<BVMinisatSatSolver>;
 
 BVSatSolverInterface* SatSolverFactory::createMinisat() {
   return new BVMinisatSatSolver();
@@ -45,3 +48,5 @@ void SatSolverFactory::getSolverIds(std::vector<std::string>& solvers) {
   SatSolverRegistry::getSolverIds(solvers);
 }
 
+} /* namespace CVC4::prop */
+} /* namespace CVC4 */
-- 
2.30.2