Skip to content

check_hresult returns the hresult as a convenience #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 1 commit into from
Jun 30, 2021
Merged

check_hresult returns the hresult as a convenience #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion strings/base_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,12 +576,13 @@ WINRT_EXPORT namespace winrt
throw_hresult(impl::hresult_from_win32(WINRT_IMPL_GetLastError()));
}

inline void check_hresult(hresult const result)
inline hresult check_hresult(hresult const result)
{
if (result < 0)
{
throw_hresult(result);
}
return result;
}

template<typename T>
Expand Down
2 changes: 1 addition & 1 deletion strings/base_meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

WINRT_EXPORT namespace winrt
{
void check_hresult(hresult const result);
hresult check_hresult(hresult const result);
hresult to_hresult() noexcept;

template <typename D, typename I>
Expand Down
4 changes: 2 additions & 2 deletions test/old_tests/UnitTests/hresult_error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ TEST_CASE("hresult,S_OK")
{
// This won't throw

check_hresult(S_OK);
REQUIRE(check_hresult(S_OK) == S_OK);
}

TEST_CASE("hresult,S_FALSE")
{
// This won't throw (unless you define WINRT_STRICT_HRESULT)

#ifndef WINRT_STRICT_HRESULT
check_hresult(S_FALSE);
REQUIRE(check_hresult(S_FALSE) == S_FALSE);
#else
try
{
Expand Down