diff options
| author | Finn Haedicke <finn@informatik.uni-bremen.de> | 2015-04-17 10:46:07 +0200 |
|---|---|---|
| committer | Finn Haedicke <finn@informatik.uni-bremen.de> | 2015-04-17 10:46:07 +0200 |
| commit | ca31b5f9de8575b9d6878c7ad7a674e48ae3c6df (patch) | |
| tree | 1de4d4cfb4fe2ab95f6dc7b731056389677f13ca /src/prop/minisat/simp | |
| parent | 1c95df5efa3727a8b709049ef26ebb3fe6f0c6eb (diff) | |
moved Minisat namespace into CVC4
This avoids conflicts when CVC4 is linked to an application that
also uses plain Minisat.
Diffstat (limited to 'src/prop/minisat/simp')
| -rw-r--r-- | src/prop/minisat/simp/SimpSolver.cc | 2 | ||||
| -rw-r--r-- | src/prop/minisat/simp/SimpSolver.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/prop/minisat/simp/SimpSolver.cc b/src/prop/minisat/simp/SimpSolver.cc index 71e747f72..8408503e2 100644 --- a/src/prop/minisat/simp/SimpSolver.cc +++ b/src/prop/minisat/simp/SimpSolver.cc @@ -23,8 +23,8 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "prop/minisat/utils/System.h" #include "prop/options.h" #include "proof/proof.h" -using namespace Minisat; using namespace CVC4; +using namespace CVC4::Minisat; //================================================================================================= // Options: diff --git a/src/prop/minisat/simp/SimpSolver.h b/src/prop/minisat/simp/SimpSolver.h index e1dfeb95e..370304d22 100644 --- a/src/prop/minisat/simp/SimpSolver.h +++ b/src/prop/minisat/simp/SimpSolver.h @@ -33,6 +33,7 @@ namespace prop { } } +namespace CVC4 { namespace Minisat { //================================================================================================= @@ -235,5 +236,6 @@ inline lbool SimpSolver::solveLimited (const vec<Lit>& assumps, bool do_simp, bo //================================================================================================= } +} #endif |