Skip to content

Commit 8b3a695

Browse files
committed
fix gcc harder
1 parent 8ec3376 commit 8b3a695

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

include/exec/sequence/any_sequence_of.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ namespace experimental::execution
6363

6464
virtual constexpr auto set_next(_item_sender _sndr) -> _void_sender
6565
{
66-
return exec::set_next(STDEXEC::__any::__value(*this),
67-
static_cast<_item_sender &&>(_sndr));
66+
return execution::set_next(STDEXEC::__any::__value(*this),
67+
static_cast<_item_sender &&>(_sndr));
6868
}
6969
};
7070
};
@@ -92,7 +92,7 @@ namespace experimental::execution
9292
using _base_t = STDEXEC::__any::__interface_base<_interface_, _Base, _extends_t>;
9393
public:
9494
using completion_signatures = __to_sequence_completions_t<_Sigs>;
95-
using item_types = exec::item_types<_item_sender_t>;
95+
using item_types = execution::item_types<_item_sender_t>;
9696
using sender_concept = sequence_sender_t;
9797
using _any_receiver_ref_t = any_sequence_receiver_ref<_Sigs, _Queries>;
9898
using _base_t::_base_t;
@@ -113,7 +113,7 @@ namespace experimental::execution
113113
return STDEXEC::__any::__value(std::move(*this)).subscribe(std::move(_rcvr));
114114
else
115115
return _any_opstate_base{__in_place_from,
116-
exec::subscribe,
116+
execution::subscribe,
117117
STDEXEC::__any::__value(std::move(*this)),
118118
std::move(_rcvr)};
119119
}
@@ -173,8 +173,8 @@ namespace experimental::execution
173173
STDEXEC::__any::__any_ptr<_any::_isequence_receiver<_Sigs, _Queries>::template _interface_>>
174174
{
175175
private:
176-
using _item_sender_t = any_sender<any_receiver<_Sigs, _Queries>>;
177-
using _item_types_t = exec::item_types<_item_sender_t>;
176+
using _item_sender_t = execution::any_sender<any_receiver<_Sigs, _Queries>>;
177+
using _item_types_t = execution::item_types<_item_sender_t>;
178178
using _base_t = STDEXEC::__pointer_receiver<
179179
STDEXEC::__any::__any_ptr<_any::_isequence_receiver<_Sigs, _Queries>::template _interface_>>;
180180

include/stdexec/__detail/__any.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ namespace STDEXEC::__any
17511751
constexpr explicit __any(__in_place_from_t, _Fn &&__fn, _Args &&...__args)
17521752
: __any()
17531753
{
1754-
(*this).template __emplace_from_(static_cast<_Fn &&>(__fn), static_cast<_Args &&>(__args)...);
1754+
(*this).__emplace_from_(static_cast<_Fn &&>(__fn), static_cast<_Args &&>(__args)...);
17551755
}
17561756

17571757
// Implicit derived-to-base conversion constructor

include/stdexec/__detail/__awaitable.hpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,18 @@ namespace STDEXEC
8484
constexpr auto __as_lvalue(_Tp &&) -> _Tp &;
8585

8686
template <class _Awaitable, class... _Promise>
87-
requires __awaitable<_Awaitable, _Promise...>
88-
using __await_result_t = decltype(STDEXEC::__as_lvalue(
87+
struct __await_result
88+
{
89+
using __t = decltype(STDEXEC::__as_lvalue(
8990
STDEXEC::__get_awaiter(
9091
STDEXEC::__get_awaitable(__declval<_Awaitable>(),
9192
__declval<_Promise &>()...)))
9293
.await_resume());
94+
};
95+
96+
template <class _Awaitable, class... _Promise>
97+
requires __awaitable<_Awaitable, _Promise...>
98+
using __await_result_t = __t<__await_result<_Awaitable, _Promise...>>;
9399

94100
#else
95101

include/stdexec/__detail/__connect_awaitable.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ namespace STDEXEC
162162
: __opstate_(__opstate)
163163
{}
164164

165+
# if !STDEXEC_GCC() || STDEXEC_GCC_VERSION >= 12'00
165166
static constexpr auto
166167
operator new([[maybe_unused]] std::size_t __bytes, __opstate_t& __opstate) noexcept -> void*
167168
{
@@ -173,6 +174,7 @@ namespace STDEXEC
173174
{
174175
// no-op
175176
}
177+
# endif
176178

177179
constexpr auto get_return_object() noexcept -> __task
178180
{

0 commit comments

Comments
 (0)