From 918b0fd9ecde048773d245eac66eba9b4306d9d2 Mon Sep 17 00:00:00 2001 From: Tim King Date: Fri, 23 Oct 2015 16:57:48 -0700 Subject: 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 *. --- src/prop/bvminisat/mtl/Alg.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/prop/bvminisat/mtl/Alg.h') diff --git a/src/prop/bvminisat/mtl/Alg.h b/src/prop/bvminisat/mtl/Alg.h index f3ecdecc5..e61dbb415 100644 --- a/src/prop/bvminisat/mtl/Alg.h +++ b/src/prop/bvminisat/mtl/Alg.h @@ -23,6 +23,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "prop/bvminisat/mtl/Vec.h" +namespace CVC4 { namespace BVMinisat { //================================================================================================= @@ -79,6 +80,7 @@ template static inline void append(const vec& from, vec& to){ copy(from, to, true); } //================================================================================================= -} +} /* CVC4::BVMinisat namespace */ +} /* CVC4 namespace */ #endif -- cgit v1.2.3