diff options
author | Tim King <taking@cs.nyu.edu> | 2012-03-29 19:38:42 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-03-29 19:38:42 +0000 |
commit | af9a90a1b3df29f7955d255aff1fd26e9957018d (patch) | |
tree | 601dfb10409903d5be3a16a6d0760bc438096d03 | |
parent | 6ba22cdd0e38f9811daefd2aee8218b8b8cf9e0e (diff) |
Fixes a linking problem with the new SatSolverConstructor on Mac.
-rw-r--r-- | src/prop/bvminisat/bvminisat.h | 2 | ||||
-rw-r--r-- | src/prop/minisat/minisat.h | 2 | ||||
-rw-r--r-- | 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 */ |