diff options
| author | Tim King <taking@google.com> | 2015-10-23 16:57:48 -0700 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2015-10-26 09:56:58 -0700 |
| commit | 918b0fd9ecde048773d245eac66eba9b4306d9d2 (patch) | |
| tree | 218d4b5aadbebd440185dc00e4f6589287326b19 /src/prop/bvminisat/mtl/Alloc.h | |
| parent | af86e5a8dc7a64fb5f7b4ca7bd3b2bedf5e8fe32 (diff) | |
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 *.
Diffstat (limited to 'src/prop/bvminisat/mtl/Alloc.h')
| -rw-r--r-- | src/prop/bvminisat/mtl/Alloc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/prop/bvminisat/mtl/Alloc.h b/src/prop/bvminisat/mtl/Alloc.h index f4303044f..4e58ab159 100644 --- a/src/prop/bvminisat/mtl/Alloc.h +++ b/src/prop/bvminisat/mtl/Alloc.h @@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "prop/bvminisat/mtl/XAlloc.h" #include "prop/bvminisat/mtl/Vec.h" +namespace CVC4 { namespace BVMinisat { //================================================================================================= @@ -126,6 +127,7 @@ RegionAllocator<T>::alloc(int size) //================================================================================================= -} +} /* CVC4::BVMinisat namespace */ +} /* CVC4 namespace */ #endif |