mirror of
https://github.com/microsoft/GSL.git
synced 2025-08-01 03:34:28 +02:00
Properly handle finally(actual_function) (#1056)
`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:
@@ -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
|
||||||
|
@@ -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;
|
||||||
|
Reference in New Issue
Block a user