From 40781877cfb5dd13fbc4da63d8b28e2d07c93df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Sat, 15 Oct 2022 22:00:51 +0530 Subject: [PATCH 1/3] check_bool now returns T --- strings/base_error.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/strings/base_error.h b/strings/base_error.h index 69e23adbd..b375d3913 100644 --- a/strings/base_error.h +++ b/strings/base_error.h @@ -619,12 +619,14 @@ WINRT_EXPORT namespace winrt } template - void check_bool(T result WINRT_IMPL_SOURCE_LOCATION_ARGS) + T check_bool(T result WINRT_IMPL_SOURCE_LOCATION_ARGS) { if (!result) { winrt::throw_last_error(WINRT_IMPL_SOURCE_LOCATION_FORWARD_SINGLE_PARAM); } + + return result; } template From 951e64bd6aae42ced408f82ec9ea02b8daaaf4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Sat, 22 Oct 2022 12:56:13 +0530 Subject: [PATCH 2/3] Added test --- test/old_tests/UnitTests/Errors.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/old_tests/UnitTests/Errors.cpp b/test/old_tests/UnitTests/Errors.cpp index 85a2d2a60..93ab784c7 100644 --- a/test/old_tests/UnitTests/Errors.cpp +++ b/test/old_tests/UnitTests/Errors.cpp @@ -200,6 +200,8 @@ TEST_CASE("Errors") SetLastError(ERROR_CANCELLED); REQUIRE_THROWS_AS(check_bool(static_cast(false)), hresult_canceled); + REQUIRE_NOTHROW(check_bool(true) == true); + // Support for Win32 errors. check_win32(ERROR_SUCCESS); REQUIRE_THROWS_AS(check_win32(ERROR_CANCELLED), hresult_canceled); From 1f0226a7bfaad861bfc662cd60a1fb322a8446e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Mon, 24 Oct 2022 21:29:28 +0530 Subject: [PATCH 3/3] Update test/old_tests/UnitTests/Errors.cpp Co-authored-by: Kenny Kerr --- test/old_tests/UnitTests/Errors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/old_tests/UnitTests/Errors.cpp b/test/old_tests/UnitTests/Errors.cpp index d5146575f..33e9b422f 100644 --- a/test/old_tests/UnitTests/Errors.cpp +++ b/test/old_tests/UnitTests/Errors.cpp @@ -200,7 +200,7 @@ TEST_CASE("Errors") SetLastError(ERROR_CANCELLED); REQUIRE_THROWS_AS(check_bool(static_cast(false)), hresult_canceled); - REQUIRE_NOTHROW(check_bool(true) == true); + REQUIRE(check_bool(true) == true); // Support for Win32 errors. check_win32(ERROR_SUCCESS);