fix search-n-replace bug

Author: ericniebler

include/stdexec/__detail/__any.hpp

@@ -530,7 +530,9 @@ namespace STDEXEC::__any {
     class _Extension = __iabstract<_Interface>
   >
   struct __reference_model
-    : _Interface<__mcall1<__bases_of<_Interface>, __reference_root<_Interface, _Value, _Extension>>> {
+    : _Interface<
+        __mcall1<__bases_of<_Interface>, __reference_root<_Interface, _Value, _Extension>>
+      > {
     using __base_t =
       _Interface<__mcall1<__bases_of<_Interface>, __reference_root<_Interface, _Value, _Extension>>>;
     using __base_t::__base_t;
@@ -594,7 +596,7 @@ namespace STDEXEC::__any {
   struct interface : _Base {
     static_assert(std::popcount(_BufferAlignment) == 1, "BufferAlignment must be a power of two");
     using __bases_type = _BaseInterfaces;
-    using __interface_type = __iabstract<_Interface, _BaseInterfaces>;
+    using __this_interface_type = __iabstract<_Interface, _BaseInterfaces>;
     using _Base::__indirect_bind_;
     using _Base::__slice_to_;
     using _Base::_Base;
@@ -608,15 +610,16 @@ namespace STDEXEC::__any {
                                                  : _Base::__buffer_alignment;
 
     static constexpr bool __nothrow_slice =
-      STDEXEC::__any::__nothrow_slice<__interface_type, _Base, __buffer_size>;
+      STDEXEC::__any::__nothrow_slice<__this_interface_type, _Base, __buffer_size>;
 
     //! @pre !empty(*this)
     constexpr virtual void
       __slice_to_(__value_proxy_root<_Interface> &__out) noexcept(__nothrow_slice) {
       STDEXEC_ASSERT(!__empty(*this));
       if constexpr (_Base::__box_kind != __box_kind::__abstract) {
         using __root_interface_t = _Base::__interface_type;
-        constexpr bool __is_root_interface = std::same_as<__root_interface_t, __interface_type>;
+        constexpr bool __is_root_interface =
+          std::same_as<__root_interface_t, __this_interface_type>;
         STDEXEC_ASSERT(!__is_root_interface);
         if constexpr (!__is_root_interface) {
           if constexpr (_Base::__box_kind == __box_kind::__proxy) {
@@ -893,7 +896,7 @@ namespace STDEXEC::__any {
   struct __reference_union {
     union {
       _Value *__value_ptr_ = nullptr;
-      __iroot *__root_ptr_; // points to a __value_root<_Extension, __value_type>
+      __iroot *__root_ptr_; // points to a __value_root<_Extension, _Value>
     };
     bool __which_ = false; // true if root, false if value
   };

include/stdexec/__detail/__utility.hpp

@@ -259,21 +259,21 @@ namespace STDEXEC {
 
   //////////////////////////////////////////////////////////////////////////////////////////
   // __polymorphic_downcast
-  template <class ResultPtr, class CvInterface>
+  template <class _ResultPtr, class _CvInterface>
   [[nodiscard]]
-  inline constexpr auto* __polymorphic_downcast(CvInterface* from) noexcept {
-    static_assert(std::is_pointer_v<ResultPtr>);
-    using value_type = __copy_cvref_t<CvInterface, std::remove_pointer_t<ResultPtr>>;
+  inline constexpr auto* __polymorphic_downcast(_CvInterface* __from_ptr) noexcept {
+    static_assert(std::is_pointer_v<_ResultPtr>);
+    using __value_type = __copy_cvref_t<_CvInterface, std::remove_pointer_t<_ResultPtr>>;
     static_assert(
-      std::derived_from<value_type, CvInterface>,
+      std::derived_from<__value_type, _CvInterface>,
       "__polymorphic_downcast requires From to be a base class of To");
 
 #if defined(__cpp_rtti) && __cpp_rtti >= 1997'11L
     STDEXEC_IF_NOT_CONSTEVAL {
-      STDEXEC_ASSERT(dynamic_cast<value_type*>(from) != nullptr);
+      STDEXEC_ASSERT(dynamic_cast<__value_type*>(__from_ptr) != nullptr);
     }
 #endif
-    return static_cast<value_type*>(from);
+    return static_cast<__value_type*>(__from_ptr);
   }
 
   namespace __std {
@@ -284,14 +284,14 @@ namespace STDEXEC {
 #else
     template <class _Ty>
     STDEXEC_ATTRIBUTE(nodiscard, always_inline)
-    _Ty* start_lifetime_as(void* p) noexcept {
-      return std::launder(static_cast<_Ty*>(p));
+    _Ty* start_lifetime_as(void* __ptr) noexcept {
+      return std::launder(static_cast<_Ty*>(__ptr));
     }
 
     template <class _Ty>
     STDEXEC_ATTRIBUTE(nodiscard, always_inline)
-    _Ty const * start_lifetime_as(void const * p) noexcept {
-      return std::launder(static_cast<_Ty const *>(p));
+    _Ty const * start_lifetime_as(void const * __ptr) noexcept {
+      return std::launder(static_cast<_Ty const *>(__ptr));
     }
 #endif
 

test/stdexec/detail/test_any.cpp

@@ -90,7 +90,8 @@ struct foobar {
   State state;
 };
 
-static_assert(std::derived_from<any::__iabstract<any::__icopyable>, any::__iabstract<any::__imovable>>);
+static_assert(
+  std::derived_from<any::__iabstract<any::__icopyable>, any::__iabstract<any::__imovable>>);
 static_assert(std::derived_from<any::__iabstract<ibar>, any::__iabstract<ifoo>>);
 static_assert(!std::derived_from<any::__iabstract<ibar>, any::__iabstract<any::__icopyable>>);
 static_assert(any::__extension_of<any::__iabstract<ibar>, any::__icopyable>);
@@ -117,7 +118,7 @@ struct IBar : any::interface<IBar, Base, any::__extends<any::__icopyable>> {
 template <class Base>
 struct IBaz
   : any::interface<IBaz, Base, any::__extends<IFoo, IBar>> // inherits twice
-                                                         // from __icopyable
+                                                           // from __icopyable
 {
   using IBaz::interface::interface;
 
@@ -162,8 +163,8 @@ consteval void test_consteval() {
   auto y = any::__any_cast<foobar<T>>(pifoo);
 }
 
-TEMPLATE_TEST_CASE("basic usage", "[any]", foobar<Small>, foobar<Big>) {
-#if ANY_COMPILER_CLANG || ANY_COMPILER_GCC >= 14'03
+TEMPLATE_TEST_CASE("basic usage of any::__any", "[detail][any]", foobar<Small>, foobar<Big>) {
+#if STDEXEC_CLANG() || (STDEXEC_GCC() && STDEXEC_GCC_VERSION >= 14'03)
   test_consteval<TestType>(); // NOLINT(invalid_consteval_call)
 #endif