Fix ambiguous overloads error with clang 19.

chriskohlhoff · Dec 2, 2024 · 91b38c3 · 91b38c3
1 parent 959a4bb
commit 91b38c3
Showing 1 changed file with 42 additions and 3 deletions.
diff --git a/asio/include/asio/execution/blocking_adaptation.hpp b/asio/include/asio/execution/blocking_adaptation.hpp
@@ -470,6 +470,36 @@ const T disallowed_t<I>::static_query_v;
 #endif // defined(ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
+template <typename>
+struct is_blocking_adaptation_t : false_type
+{
+};
+
+template <int I>
+struct is_blocking_adaptation_t<blocking_adaptation_t<I>> : true_type
+{
+};
+
+template <typename>
+struct is_allowed_t : false_type
+{
+};
+
+template <int I>
+struct is_allowed_t<allowed_t<I>> : true_type
+{
+};
+
+template <typename>
+struct is_disallowed_t : false_type
+{
+};
+
+template <int I>
+struct is_disallowed_t<disallowed_t<I>> : true_type
+{
+};
+
 template <typename Executor>
 class adapter
 {
@@ -509,7 +539,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_query<const Executor&, Property>::value,
+    can_query<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     query_result_t<const Executor&, Property>
   > query(const Property& p) const
     noexcept(is_nothrow_query<const Executor&, Property>::value)
@@ -525,7 +558,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_require<const Executor&, Property>::value,
+    can_require<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     adapter<decay_t<require_result_t<const Executor&, Property>>>
   > require(const Property& p) const
     noexcept(is_nothrow_require<const Executor&, Property>::value)
@@ -536,7 +572,10 @@ class adapter
 
   template <typename Property>
   enable_if_t<
-    can_prefer<const Executor&, Property>::value,
+    can_prefer<const Executor&, Property>::value
+      && !is_blocking_adaptation_t<Property>::value
+      && !is_allowed_t<Property>::value
+      && !is_disallowed_t<Property>::value,
     adapter<decay_t<prefer_result_t<const Executor&, Property>>>
   > prefer(const Property& p) const
     noexcept(is_nothrow_prefer<const Executor&, Property>::value)