summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDejan Jovanović <dejan.jovanovic@gmail.com>2012-03-26 12:29:21 +0000
committerDejan Jovanović <dejan.jovanovic@gmail.com>2012-03-26 12:29:21 +0000
commit9918f0e86a38f5fc8671ec6115eaac9b2c3b31d8 (patch)
tree4c52e6a78ece4eccb3ada66e51fe2217d3f62e05
parentb36ec4366123452550a1f0772ca0508dd49e66b9 (diff)
more datail from the build failure
-rw-r--r--.cproject8
-rw-r--r--src/prop/bvminisat/bvminisat.cpp2
-rw-r--r--src/prop/bvminisat/bvminisat.h2
-rw-r--r--src/prop/minisat/minisat.cpp2
-rw-r--r--src/prop/minisat/minisat.h2
5 files changed, 12 insertions, 4 deletions
diff --git a/.cproject b/.cproject
index 6145dec05..6467c05f2 100644
--- a/.cproject
+++ b/.cproject
@@ -326,6 +326,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
+ <target name="check" path="test/unit" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-j10</buildArguments>
+ <buildTarget>check</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
</buildTargets>
</storageModule>
</cproject>
diff --git a/src/prop/bvminisat/bvminisat.cpp b/src/prop/bvminisat/bvminisat.cpp
index d4e123489..3d2d4c9ea 100644
--- a/src/prop/bvminisat/bvminisat.cpp
+++ b/src/prop/bvminisat/bvminisat.cpp
@@ -120,7 +120,7 @@ void MinisatSatSolver::renewVar(SatLiteral lit, int level) {
Unreachable();
}
-int MinisatSatSolver::getAssertionLevel() const {
+unsigned MinisatSatSolver::getAssertionLevel() const {
// we have no user context implemented so far
return 0;
}
diff --git a/src/prop/bvminisat/bvminisat.h b/src/prop/bvminisat/bvminisat.h
index 7c12fcbd0..ed164904e 100644
--- a/src/prop/bvminisat/bvminisat.h
+++ b/src/prop/bvminisat/bvminisat.h
@@ -48,7 +48,7 @@ public:
void unregisterVar(SatLiteral lit);
void renewVar(SatLiteral lit, int level = -1);
- int getAssertionLevel() const;
+ unsigned getAssertionLevel() const;
// helper methods for converting from the internal Minisat representation
diff --git a/src/prop/minisat/minisat.cpp b/src/prop/minisat/minisat.cpp
index bc611a097..ede18c585 100644
--- a/src/prop/minisat/minisat.cpp
+++ b/src/prop/minisat/minisat.cpp
@@ -161,7 +161,7 @@ bool DPLLMinisatSatSolver::properExplanation(SatLiteral lit, SatLiteral expl) co
/** Incremental interface */
-int DPLLMinisatSatSolver::getAssertionLevel() const {
+unsigned DPLLMinisatSatSolver::getAssertionLevel() const {
return d_minisat->getAssertionLevel();
}
diff --git a/src/prop/minisat/minisat.h b/src/prop/minisat/minisat.h
index 81a12c491..dc06753ab 100644
--- a/src/prop/minisat/minisat.h
+++ b/src/prop/minisat/minisat.h
@@ -69,7 +69,7 @@ public:
/** Incremental interface */
- int getAssertionLevel() const;
+ unsigned getAssertionLevel() const;
void push();
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback