Convert to bool in suite::expect

2015-06-13 21:02:51 -07:00
parent 0fcd3da046
commit 237b5e704f
1 changed files with 8 additions and 4 deletions
@@ -346,11 +346,13 @@ bool
 suite::expect (Condition shouldBeTrue,
    String const& reason)
 {
-    if (shouldBeTrue)
+    bool const b =
+        static_cast<bool>(shouldBeTrue);
+    if (b)
        pass();
    else
        fail (reason);
-    return shouldBeTrue;
+    return b;
 }

 template <class Condition, class String>
@@ -359,11 +361,13 @@ bool
 suite::unexpected (Condition shouldBeFalse,
    String const& reason)
 {
-    if (! shouldBeFalse)
+    bool const b =
+        static_cast<bool>(shouldBeFalse);
+    if (! b)
        pass();
    else
        fail (reason);
-    return ! shouldBeFalse;
+    return ! b;
 }

 template <class>