diff --git a/unittests/boxed_cast_test.cpp b/unittests/boxed_cast_test.cpp index 855619a3..ec7baeae 100644 --- a/unittests/boxed_cast_test.cpp +++ b/unittests/boxed_cast_test.cpp @@ -17,9 +17,8 @@ bool run_test_type_conversion(const Boxed_Value &bv, bool expectedpass) if (expectedpass) { std::cerr << "Failure in run_test_type_conversion: " << e.what() << '\n'; return false; - } else { - return true; } + return true; } catch (const std::exception &e) { std::cerr << "Unexpected standard exception when attempting cast_conversion: " << e.what() << '\n'; return false; @@ -28,12 +27,7 @@ bool run_test_type_conversion(const Boxed_Value &bv, bool expectedpass) return false; } - if (expectedpass) - { - return true; - } else { - return false; - } + return expectedpass; } template @@ -287,8 +281,6 @@ bool pointer_test(const T& default_value, const T& new_value) delete p; return false; } - - } @@ -315,11 +307,9 @@ int main() // storing a pointer passed &= pointer_test(1, 0); - if (passed) - { + if (passed) { return EXIT_SUCCESS; - } else { - return EXIT_FAILURE; } + return EXIT_FAILURE; } diff --git a/unittests/integer_literal_test.cpp b/unittests/integer_literal_test.cpp index 3187b65d..01920cb8 100644 --- a/unittests/integer_literal_test.cpp +++ b/unittests/integer_literal_test.cpp @@ -25,9 +25,8 @@ bool test_literal(T val, const std::string &str, bool use_boxed_number = false) T val2 = [&](){ if (!use_boxed_number) { return chai.eval(str); - } else { - return chai.eval(str).get_as_checked(); } + return chai.eval(str).get_as_checked(); }(); std::cout << "' chai '" << val2 << "'\n"; @@ -272,10 +271,9 @@ int main() ) { return EXIT_SUCCESS; - } else { - return EXIT_FAILURE; } + return EXIT_FAILURE; }