Skip to content

Commit c558840

Browse files
committed
__out is taken by microsoft so use a different identifier
1 parent 8d25b94 commit c558840

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

include/stdexec/__detail/__any.hpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ namespace STDEXEC::__any {
614614

615615
//! @pre !empty(*this)
616616
constexpr virtual void
617-
__slice_to_(__value_proxy_root<_Interface> &__out) noexcept(__nothrow_slice) {
617+
__slice_to_(__value_proxy_root<_Interface> &__result) noexcept(__nothrow_slice) {
618618
STDEXEC_ASSERT(!__empty(*this));
619619
if constexpr (_Base::__box_kind != __box_kind::__abstract) {
620620
using __root_interface_t = _Base::__interface_type;
@@ -623,36 +623,36 @@ namespace STDEXEC::__any {
623623
STDEXEC_ASSERT(!__is_root_interface);
624624
if constexpr (!__is_root_interface) {
625625
if constexpr (_Base::__box_kind == __box_kind::__proxy) {
626-
__value(*this).__slice_to_(__out);
626+
__value(*this).__slice_to_(__result);
627627
__reset(*this);
628628
} else // if constexpr (_Base::__box_kind == __box_kind::__object)
629629
{
630630
// Move from type-erased values, but not from type-erased references
631631
constexpr bool __is_value = (_Base::__root_kind == __root_kind::__value);
632632
// potentially throwing:
633-
__out.emplace(STDEXEC_DECAY_COPY(STDEXEC::__move_if<__is_value>(__value(*this))));
633+
__result.emplace(STDEXEC_DECAY_COPY(STDEXEC::__move_if<__is_value>(__value(*this))));
634634
}
635635
}
636636
}
637637
}
638638

639639
//! @pre !empty(*this)
640-
constexpr virtual void __indirect_bind_(__reference_proxy_root<_Interface> &__out) noexcept {
640+
constexpr virtual void __indirect_bind_(__reference_proxy_root<_Interface> &__result) noexcept {
641641
STDEXEC_ASSERT(!__empty(*this));
642642
if constexpr (_Base::__box_kind == __box_kind::__proxy)
643-
__value(*this).__indirect_bind_(__out);
643+
__value(*this).__indirect_bind_(__result);
644644
else if constexpr (_Base::__box_kind == __box_kind::__object)
645-
__out.__object_bind_(*this);
645+
__result.__object_bind_(*this);
646646
}
647647

648648
//! @pre !empty(*this)
649649
constexpr virtual void
650-
__indirect_bind_(__reference_proxy_root<_Interface> &__out) const noexcept {
650+
__indirect_bind_(__reference_proxy_root<_Interface> &__result) const noexcept {
651651
STDEXEC_ASSERT(!__empty(*this));
652652
if constexpr (_Base::__box_kind == __box_kind::__proxy)
653-
__value(*this).__indirect_bind_(__out);
653+
__value(*this).__indirect_bind_(__result);
654654
else if constexpr (_Base::__box_kind == __box_kind::__object)
655-
__out.__object_bind_(*this);
655+
__result.__object_bind_(*this);
656656
}
657657
};
658658

@@ -1099,7 +1099,7 @@ namespace STDEXEC::__any {
10991099
else {
11001100
if constexpr (std::derived_from<_CvModel, __iabstract<_Interface>>) {
11011101
//! Optimize for when Base derives from __iabstract<_Interface>. _Store the
1102-
//! address of __value(__other) directly in __out as a tagged __ptr instead of
1102+
//! address of __value(__other) directly in __result as a tagged ptr instead of
11031103
//! introducing an indirection.
11041104
//! @post __is_tagged() == true
11051105
auto &__ptr = *__std::start_lifetime_as<__tagged_ptr>(__buff_);
@@ -1589,7 +1589,7 @@ namespace STDEXEC::__any {
15891589
if (__proxy_ptr == nullptr || __empty(*__proxy_ptr))
15901590
return;
15911591
// _Optimize for when _CvValueProxy derives from __iabstract<_Interface>. _Store the address
1592-
// of __value(__other) directly in __out as a tagged __ptr instead of introducing an
1592+
// of __value(__other) directly in __result as a tagged ptr instead of introducing an
15931593
// indirection.
15941594
else if constexpr (std::derived_from<_CvValueProxy, __iabstract<_Interface>>)
15951595
__reference_.__model_bind_(STDEXEC::__as_const_if<__is_const_>(__value(*__proxy_ptr)));

0 commit comments

Comments
 (0)