<generator>: Make nested types of generator ADL-proof
#4464
Conversation
which is consistent with the handling of `polymorphic_allocator`.
| @@ -220,20 +230,21 @@ public: | |||
| template <class _Rty, class _Vty, class _Alloc, class _Unused> | |||
| requires same_as<_Gen_yield_t<_Gen_reference_t<_Rty, _Vty>>, _Yielded> | |||
| _NODISCARD auto yield_value(_RANGES elements_of<generator<_Rty, _Vty, _Alloc>&&, _Unused> _Elem) noexcept { | |||
| return _Nested_awaitable<_Rty, _Vty, _Alloc>{std::move(_Elem.range)}; | |||
| using _Nested_awaitable = _Nested_awaitable_provider<_Rty, _Vty, _Alloc>::_Awaitable; | |||
| return _Nested_awaitable{std::move(_Elem.range)}; | |||
There was a problem hiding this comment.
We should use _STD in product code.
| using validator = holder<incomplete>*; | ||
| auto yield_range = []() -> std::generator<validator> { | ||
| co_yield ranges::elements_of( | ||
| ranges::views::repeat(nullptr, 42) | ranges::views::transform([](std::nullptr_t) { return validator{}; })); |
There was a problem hiding this comment.
Should include <cstddef> for std::nullptr_t.
|
Thanks! I'll go ahead and merge this, and then I'll prepare a followup PR to fix the nitpicks I noticed plus a couple other pre-existing issues. |
StephanTLavavej
merged commit d5c525d
into
microsoft:feature/generator
|
I previously wrote
But this paragraph is wrong -
|
Towards #2936.
Per the synopsis in [coro.generator.class], the
iteratorandpromise_typetypes are non-template classes, so they should be ADL-proof even if the enclosinggeneratorspecialization is ADL-incompatible._Nested_awaitableis also changed to a nested non-template class to makegenerator<holder<incomplete>*>yieldable._Promise_allocatoris currently unchangedbecause Cpp17Allocator essentially requires allocator types to be ADL-compatible.Perhaps we should change it to a member marked withThis is wrong.[[msvc::no_unique_address]]later.Drive-by change: make the default template arguments of
elements_ofand its deduction guide conditionally present, which is consistent withpolymorphic_allocator.STL/stl/inc/xpolymorphic_allocator.h
Lines 196 to 201 in d6efe94