From 88743c3ad53c69da922897647b50efbb1eb0c36d Mon Sep 17 00:00:00 2001 From: BartolomeyKant Date: Thu, 19 Mar 2026 21:49:37 +0500 Subject: [PATCH] rename template parameters conflicting with ctype.h defines --- .../stdexec/__detail/__parallel_scheduler.hpp | 2 +- include/stdexec/__detail/__stop_when.hpp | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/stdexec/__detail/__parallel_scheduler.hpp b/include/stdexec/__detail/__parallel_scheduler.hpp index cf16ccb8f..4c39e8b12 100644 --- a/include/stdexec/__detail/__parallel_scheduler.hpp +++ b/include/stdexec/__detail/__parallel_scheduler.hpp @@ -62,7 +62,7 @@ namespace STDEXEC class parallel_scheduler; class __parallel_sender; - template + template class __parallel_bulk_sender; /// Returns a scheduler that can add work to the underlying execution context. diff --git a/include/stdexec/__detail/__stop_when.hpp b/include/stdexec/__detail/__stop_when.hpp index 8a337beec..ad064c5a6 100644 --- a/include/stdexec/__detail/__stop_when.hpp +++ b/include/stdexec/__detail/__stop_when.hpp @@ -104,20 +104,20 @@ namespace STDEXEC template struct callback_type { - template - requires __std::constructible_from<_Fn, _C> - explicit callback_type(__fused_token&& __ftkn, _C&& __fn) - noexcept(__nothrow_constructible_from<_Fn, _C>) - : __fn_(static_cast<_C&&>(__fn)) + template + requires __std::constructible_from<_Fn, _Cb> + explicit callback_type(__fused_token&& __ftkn, _Cb&& __fn) + noexcept(__nothrow_constructible_from<_Fn, _Cb>) + : __fn_(static_cast<_Cb&&>(__fn)) , __cb1_(std::move(__ftkn.__tkn1_), __cb(this)) , __cb2_(std::move(__ftkn.__tkn2_), __cb(this)) {} - template - requires __std::constructible_from<_Fn, _C> - explicit callback_type(__fused_token const & __ftkn, _C&& __fn) - noexcept(__nothrow_constructible_from<_Fn, _C>) - : __fn_(static_cast<_C&&>(__fn)) + template + requires __std::constructible_from<_Fn, _Cb> + explicit callback_type(__fused_token const & __ftkn, _Cb&& __fn) + noexcept(__nothrow_constructible_from<_Fn, _Cb>) + : __fn_(static_cast<_Cb&&>(__fn)) , __cb1_(__ftkn.__tkn1_, __cb(this)) , __cb2_(__ftkn.__tkn2_, __cb(this)) {}