para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly handle finally(actual_function) (#1056)

Browse Source 
`finally` needs to use `decay_t` instead of `remove_cvref_t` so it can properly accept non-object function arguments by decaying to function pointer type. Adds test coverage for this use case which was previously missing.
This commit is contained in:
Casey Carter 2022-09-29 08:59:05 -07:00 committed by GitHub
parent 8840d87199
commit d9ffa118c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gsl/util
View File

@ -87,7 +87,7 @@ private:
template <class F> template <class F>
GSL_NODISCARD auto finally(F&& f) noexcept GSL_NODISCARD auto finally(F&& f) noexcept
{ {
return final_action<std::remove_cv_t<std::remove_reference_t<F>>>{std::forward<F>(f)}; return final_action<std::decay_t<F>>{std::forward<F>(f)};
} }
// narrow_cast(): a searchable way to do narrowing casts of values // narrow_cast(): a searchable way to do narrowing casts of values

10
tests/utils_tests.cpp
View File

@ -112,6 +112,16 @@ TEST(utils_tests, finally_function_ptr)
EXPECT_TRUE(j == 1); EXPECT_TRUE(j == 1);
} }
TEST(utils_tests, finally_function)
{
j = 0;
{
auto _ = finally(g);
EXPECT_TRUE(j == 0);
}
EXPECT_TRUE(j == 1);
}
TEST(utils_tests, narrow_cast) TEST(utils_tests, narrow_cast)
{ {
int n = 120; int n = 120;