Skip to content

Expected transform fix #76

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
martinmoene merged 2 commits into from
Jan 16, 2025
Merged

Expected transform fix #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e694e
Add test.
gogagum Jan 15, 2025
c0ee99f
Fix.
gogagum Jan 15, 2025
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
4 changes: 2 additions & 2 deletions include/nonstd/expected.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,11 +1240,11 @@ nsel_constexpr auto invoke( F && f, Args && ... args )
}

template< typename F, typename ... Args >
using invoke_result_nocvref_t = typename std20::remove_cvref< decltype( invoke( std::declval< F >(), std::declval< Args >()... ) ) >::type;
using invoke_result_nocvref_t = typename std20::remove_cvref< decltype( ::nonstd::expected_lite::detail::invoke( std::declval< F >(), std::declval< Args >()... ) ) >::type;

#if nsel_P2505R >= 5
template< typename F, typename ... Args >
using transform_invoke_result_t = typename std::remove_cv< decltype( invoke( std::declval< F >(), std::declval< Args >()... ) ) >::type;
using transform_invoke_result_t = typename std::remove_cv< decltype( ::nonstd::expected_lite::detail::invoke( std::declval< F >(), std::declval< Args >()... ) ) >::type;
#else
template< typename F, typename ... Args >
using transform_invoke_result_t = invoke_result_nocvref_t
Expand Down
2 changes: 2 additions & 0 deletions test/expected.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,8 @@ CASE( "expected: Allows to transform value" " [monadic p2505r3]" )
EXPECT( ue.transform( mul2 ).error() == 42 );
}

expected<std::vector<int>, int>{std::vector<int>{}}.transform([](const std::vector<int>&) { });

#if nsel_P2505R >= 5
// R5 changed remove_cvref_t to remove_cv_t in transform/transform_error, which broke data member pointer transforms,
// because the result type must be a valid expected value type, but expressions with reference types are not.
Expand Down
Loading