mollify clang-16

Author: ericniebler

examples/benchmark/fibonacci.cpp

@@ -29,9 +29,9 @@ auto serial_fib(long n) -> long
   return n < 2 ? n : serial_fib(n - 1) + serial_fib(n - 2);
 }
 
-template <class... Ts>
+template <class... CompletionSigs>
 using any_sender_of =
-  exec::any_receiver_ref<stdexec::completion_signatures<Ts...>>::template any_sender<>;
+  exec::any_sender<exec::any_receiver<stdexec::completion_signatures<CompletionSigs...>>>;
 
 using fib_sender = any_sender_of<stdexec::set_value_t(long)>;
 

include/exec/any_sender_of.hpp

@@ -21,7 +21,6 @@
 
 #include "env.hpp"
 
-#include <cstddef>
 #include <utility>
 
 STDEXEC_PRAGMA_PUSH()
@@ -602,10 +601,8 @@ namespace experimental::execution
     struct _any_receiver_ref
       : __pointer_receiver<typename _any::_ireceiver<Sigs, Queries>::_pointer_t>
     {
-      // TODO: make sure that passing an any_receiver to this constructor does not cause
-      // double indirections.
-      template <__not_same_as<_any_receiver_ref> Receiver>
-        requires receiver_of<Receiver, Sigs>
+      template <__not_decays_to<_any_receiver_ref> Receiver>
+        requires STDEXEC::receiver_of<Receiver, Sigs>
       constexpr _any_receiver_ref(Receiver &_rcvr) noexcept
         : _any_receiver_ref::__pointer_receiver(std::addressof(_rcvr))
       {}
@@ -724,11 +721,17 @@ namespace experimental::execution
   any_receiver_ref<STDEXEC::completion_signatures<Sigs...>, Queries...>
     : _any::_any_receiver_ref<STDEXEC::completion_signatures<Sigs...>, _any::_queries_t<Queries...>>
   {
+   private:
     using _any_receiver_t =
       any_receiver<STDEXEC::completion_signatures<Sigs...>, _any::_queries_t<Queries...>>;
     using _base_t = _any::_any_receiver_ref<STDEXEC::completion_signatures<Sigs...>,
                                             _any::_queries_t<Queries...>>;
-    using _base_t::_base_t;
+   public:
+    template <STDEXEC::__not_decays_to<any_receiver_ref> Receiver>
+      requires STDEXEC::receiver_of<Receiver, STDEXEC::completion_signatures<Sigs...>>
+    constexpr any_receiver_ref(Receiver &_rcvr) noexcept
+      : _base_t{static_cast<Receiver &>(_rcvr)}
+    {}
 
     template <auto... SenderQueries>
     struct [[deprecated("use exec::any_sender<exec::any_receiver<Sigs, ReceiverQueries>, "