Skip to content

Commit

Permalink
format, comment
Browse files Browse the repository at this point in the history
  • Loading branch information
isidorostsa committed Aug 15, 2024
1 parent a631ef6 commit 1517267
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,13 @@ namespace hpx::when_all_vector_detail {
friend auto tag_invoke(hpx::execution::experimental::get_env_t,
when_all_vector_receiver const& r)
#if defined(HPX_HAVE_STDEXEC)
// TODO: This part should be using the newer env/prop utilities based on P3325
// but doing so results in an invalid memory access in the when_all_vector test.
// It is worth noting that make_env and env behave different in the following
// way:
// make_env(empty_env, with<tag, val>) -> with<tag, val>
// env(empty_env, prop<tag, val>) -> env<env<>, prop<tag, val>>
// But it is not clear at the moment why that cause an invalid memory access.
noexcept
-> hpx::execution::experimental::make_env_t<
hpx::execution::experimental::env_of_t<receiver_type>,
Expand Down
8 changes: 6 additions & 2 deletions libs/core/execution_base/tests/unit/get_env.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ namespace mylib {
};

#if defined(HPX_HAVE_STDEXEC)
auto env4 =
ex::env(std::move(env3), ex::prop(receiver_env, std::string("42")));
// clang-format off
auto env4 = ex::env(
std::move(env3), ex::prop(receiver_env, std::string("42")));
// clang-format on
using env4_t = decltype(env4);
#else
using env4_t = ex::make_env_t<receiver_env_t, std::string, env3_t>;
Expand Down Expand Up @@ -126,8 +128,10 @@ namespace mylib {
#endif

#if defined(HPX_HAVE_STDEXEC)
// clang-format off
auto env5 =
ex::env(std::move(env3), ex::prop(receiver_env1, std::string("42")));
// clang-format on
using env5_t = decltype(env5);
#else
using env5_t = ex::make_env_t<receiver_env1_t, std::string, env3_t>;
Expand Down

0 comments on commit 1517267

Please sign in to comment.