Fix for bug 447.

diff --git a/src/util/result.cpp b/src/util/result.cpp
index f51bacee74a4d56138e23513048ec9ef0c31a540..6a32747cbab9e369d2e3784747ec1d0d042016ca 100644 (file)
--- a/src/util/result.cpp
+++ b/src/util/result.cpp
@@ -92,6 +92,20 @@ bool Result::operator==(const Result& r) const throw() {
   return false;
 }
 
+bool operator==(enum Result::Sat sr, const Result& r) throw() {
+  return r == sr;
+}
+
+bool operator==(enum Result::Validity vr, const Result& r) throw() {
+  return r == vr;
+}
+bool operator!=(enum Result::Sat s, const Result& r) throw(){
+  return !(s == r);
+}
+bool operator!=(enum Result::Validity v, const Result& r) throw(){
+  return !(v == r);
+}
+
 Result Result::asSatisfiabilityResult() const throw() {
   if(d_which == TYPE_SAT) {
     return *this;

diff --git a/src/util/result.h b/src/util/result.h
index 7d53f8add3150604c8c311589ef88c241a9e46b1..fd1d82d9be2ed8c744648acf0a0da701341c287d 100644 (file)
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -155,6 +155,12 @@ std::ostream& operator<<(std::ostream& out,
 std::ostream& operator<<(std::ostream& out,
                          enum Result::UnknownExplanation e) CVC4_PUBLIC;
 
+bool operator==(enum Result::Sat s, const Result& r) throw() CVC4_PUBLIC;
+bool operator==(enum Result::Validity v, const Result& r) throw() CVC4_PUBLIC;
+
+bool operator!=(enum Result::Sat s, const Result& r) throw() CVC4_PUBLIC;
+bool operator!=(enum Result::Validity v, const Result& r) throw() CVC4_PUBLIC;
+
 }/* CVC4 namespace */
 
 #endif /* __CVC4__RESULT_H */

diff --git a/test/system/boilerplate.cpp b/test/system/boilerplate.cpp
index b4e20d063f543c4454d5037c85acca36d8ec857e..cea610b866082b87a389d10714b69f4debf7fc15 100644 (file)
--- a/test/system/boilerplate.cpp
+++ b/test/system/boilerplate.cpp
@@ -31,6 +31,6 @@ int main() {
   SmtEngine smt(&em);
   Result r = smt.query(em.mkConst(true));
 
-  return r == Result::VALID ? 0 : 1;
+  return (Result::VALID == r) ? 0 : 1;
 }