Merge 5a1a556 into 24ecb46

cpputest · May 19, 2020 · f3eb6a1 · f3eb6a1
2 parents 24ecb46 + 5a1a556
commit f3eb6a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/CppUTest/UtestMacros.h b/include/CppUTest/UtestMacros.h
@@ -102,10 +102,10 @@
   CHECK_TRUE_LOCATION(condition, "CHECK", #condition, NULLPTR, __FILE__, __LINE__)
 
 #define CHECK_TEXT(condition, text) \
-  CHECK_TRUE_LOCATION(condition, "CHECK", #condition, text, __FILE__, __LINE__)
+  CHECK_TRUE_LOCATION((bool)(condition), "CHECK", #condition, text, __FILE__, __LINE__)
 
 #define CHECK_TRUE(condition)\
-  CHECK_TRUE_LOCATION(condition, "CHECK_TRUE", #condition, NULLPTR, __FILE__, __LINE__)
+  CHECK_TRUE_LOCATION((bool) (condition), "CHECK_TRUE", #condition, NULLPTR, __FILE__, __LINE__)
 
 #define CHECK_TRUE_TEXT(condition, text)\
   CHECK_TRUE_LOCATION(condition, "CHECK_TRUE", #condition, text, __FILE__, __LINE__)

diff --git a/tests/CppUTest/CompatabilityTests.cpp b/tests/CppUTest/CompatabilityTests.cpp
@@ -9,7 +9,7 @@ TEST_GROUP(StandardCppLibrary)
 {
 };
 
-#if defined(__cplusplus) && __cplusplus >= 201103L && 0
+#if defined(__cplusplus) && __cplusplus >= 201103L
 
 TEST(StandardCppLibrary, UniquePtrConversationToBool)
 {
@@ -18,7 +18,7 @@ TEST(StandardCppLibrary, UniquePtrConversationToBool)
 
     auto const notNull = std::make_unique<int>(1);
     CHECK_TRUE(notNull);
-};
+}
 
 #endif