1 files changed, 6 insertions, 11 deletions
diff --git a/src/util/result.cpp b/src/util/result.cpp
index e6390cd41..433dcbf29 100644
--- a/src/util/result.cpp
+++ b/src/util/result.cpp
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <string>
 
-#include "base/cvc4_assert.h"
+#include "base/check.h"
 #include "options/set_language.h"
 
 using namespace std;
@@ -172,8 +172,7 @@ Result Result::asSatisfiabilityResult() const {
       case VALIDITY_UNKNOWN:
         return Result(SAT_UNKNOWN, d_unknownExplanation, d_inputName);
 
-      default:
-        Unhandled(d_validity);
+      default: Unhandled() << d_validity;
     }
   }
 
@@ -197,8 +196,7 @@ Result Result::asValidityResult() const {
       case SAT_UNKNOWN:
         return Result(VALIDITY_UNKNOWN, d_unknownExplanation, d_inputName);
 
-      default:
-        Unhandled(d_sat);
+      default: Unhandled() << d_sat;
     }
   }
 
@@ -223,8 +221,7 @@ ostream& operator<<(ostream& out, enum Result::Sat s) {
     case Result::SAT_UNKNOWN:
       out << "SAT_UNKNOWN";
       break;
-    default:
-      Unhandled(s);
+    default: Unhandled() << s;
   }
   return out;
 }
@@ -240,8 +237,7 @@ ostream& operator<<(ostream& out, enum Result::Validity v) {
     case Result::VALIDITY_UNKNOWN:
       out << "VALIDITY_UNKNOWN";
       break;
-    default:
-      Unhandled(v);
+    default: Unhandled() << v;
   }
   return out;
 }
@@ -278,8 +274,7 @@ ostream& operator<<(ostream& out, enum Result::UnknownExplanation e) {
     case Result::UNKNOWN_REASON:
       out << "UNKNOWN_REASON";
       break;
-    default:
-      Unhandled(e);
+    default: Unhandled() << e;
   }
   return out;
 }