Skip to content

Commit 7280ca9

Browse files
committed
uglification, try to fix clang CUDA build
1 parent c558840 commit 7280ca9

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

include/stdexec/__detail/__any.hpp

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,9 @@ namespace STDEXEC::__any {
501501
return *std::construct_at(
502502
reinterpret_cast<_Model *>(__buff.data()), static_cast<_Args &&>(__args)...);
503503
} else {
504-
auto *const model = ::new _Model(static_cast<_Args &&>(__args)...);
505-
*__std::start_lifetime_as<__tagged_ptr>(__buff.data()) = __tagged_ptr(model);
506-
return *model;
504+
auto *const __model = ::new _Model(static_cast<_Args &&>(__args)...);
505+
*__std::start_lifetime_as<__tagged_ptr>(__buff.data()) = __tagged_ptr(__model);
506+
return *__model;
507507
}
508508
}
509509
}
@@ -816,9 +816,9 @@ namespace STDEXEC::__any {
816816
constexpr _Value &__emplace_(_Args &&...__args) {
817817
static_assert(__decays_to<_Value, _Value>, "Value must be an object type.");
818818
using __model_type = __value_model<_Interface, _Value>;
819-
auto &model = STDEXEC::__any::__emplace_into<__model_type>(
819+
auto &__model = STDEXEC::__any::__emplace_into<__model_type>(
820820
__root_ptr_, __buff_, static_cast<_Args &&>(__args)...);
821-
return __value(model);
821+
return __value(__model);
822822
}
823823

824824
template <int = 0, class _CvRefValue, class _Value = std::decay_t<_CvRefValue>>
@@ -1091,10 +1091,10 @@ namespace STDEXEC::__any {
10911091
}
10921092

10931093
template <__extension_of<_Interface> _CvModel>
1094-
constexpr void __model_bind_(_CvModel &model) noexcept {
1094+
constexpr void __model_bind_(_CvModel &__model) noexcept {
10951095
static_assert(__extension_of<_CvModel, _Interface>, "CvModel must implement Interface");
10961096
STDEXEC_IF_CONSTEVAL {
1097-
model.__indirect_bind_(*this);
1097+
__model.__indirect_bind_(*this);
10981098
}
10991099
else {
11001100
if constexpr (std::derived_from<_CvModel, __iabstract<_Interface>>) {
@@ -1103,27 +1103,31 @@ namespace STDEXEC::__any {
11031103
//! introducing an indirection.
11041104
//! @post __is_tagged() == true
11051105
auto &__ptr = *__std::start_lifetime_as<__tagged_ptr>(__buff_);
1106-
__ptr = static_cast<__iabstract<_Interface> *>(std::addressof(STDEXEC::__unconst(model)));
1106+
__ptr = static_cast<__iabstract<_Interface> *>(
1107+
std::addressof(STDEXEC::__unconst(__model)));
11071108
} else {
11081109
//! @post __is_tagged() == false
1109-
model.__indirect_bind_(*this);
1110+
__model.__indirect_bind_(*this);
11101111
}
11111112
}
11121113
}
11131114

11141115
template <class _CvModel>
1115-
constexpr void __object_bind_(_CvModel &model) noexcept {
1116+
constexpr void __object_bind_(_CvModel &__model) noexcept {
11161117
static_assert(__extension_of<_CvModel, _Interface>);
11171118
using __extension_type = _CvModel::__interface_type;
11181119
using __value_type = _CvModel::__value_type;
11191120
using __model_type = __reference_model<_Interface, __value_type, __extension_type>;
11201121
if constexpr (_CvModel::__root_kind == __root_kind::__reference) {
11211122
STDEXEC::__any::__emplace_into<__model_type>(
1122-
__root_ptr_, __buff_, model.__get_value_ptr_(), model.__get_root_ptr_());
1123+
__root_ptr_, __buff_, __model.__get_value_ptr_(), __model.__get_root_ptr_());
11231124
} else {
1124-
__iroot *root = std::addressof(const_cast<std::remove_cv_t<_CvModel> &>(model));
1125+
__iroot *__root_ptr = std::addressof(STDEXEC::__unconst(__model));
11251126
STDEXEC::__any::__emplace_into<__model_type>(
1126-
__root_ptr_, __buff_, static_cast<__value_type *>(nullptr), STDEXEC_DECAY_COPY(root));
1127+
__root_ptr_,
1128+
__buff_,
1129+
static_cast<__value_type *>(nullptr),
1130+
STDEXEC_DECAY_COPY(__root_ptr));
11271131
}
11281132
}
11291133

include/stdexec/__detail/__utility.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ namespace STDEXEC {
343343
va_start(__args, __fmt);
344344
STDEXEC::__debug_vprintf(__fmt, __args);
345345
va_end(__args);
346-
STDEXEC_TERMINATE();
346+
std::terminate();
347347
}
348348
}
349349
} // namespace STDEXEC

0 commit comments

Comments
 (0)