fix: Work around name conflict in detail::execution

Tradias · Dec 19, 2023 · b393038 · b393038
1 parent 2fecf56
commit b393038
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/agrpc/detail/asio_utils.hpp b/src/agrpc/detail/asio_utils.hpp
@@ -32,14 +32,15 @@ template <class T>
 inline constexpr bool IS_EXECUTOR_PROVIDER<T, decltype((void)std::declval<T>().get_executor())> = true;
 
 #ifdef AGRPC_ASIO_HAS_SENDER_RECEIVER
+// Must not be named `execute`
 template <class Executor, class Function>
-void execute(Executor&& executor, Function&& function)
+void do_execute(Executor&& executor, Function&& function)
 {
     asio::execution::execute(static_cast<Executor&&>(executor), static_cast<Function&&>(function));
 }
 #else
 template <class Executor, class Function>
-void execute(Executor&& executor, Function&& function)
+void do_execute(Executor&& executor, Function&& function)
 {
     static_cast<Executor&&>(executor).execute(static_cast<Function&&>(function));
 }
@@ -48,9 +49,10 @@ void execute(Executor&& executor, Function&& function)
 template <class Executor, class Function, class Allocator>
 void post_with_allocator(Executor&& executor, Function&& function, const Allocator& allocator)
 {
-    detail::execute(asio::prefer(asio::require(static_cast<Executor&&>(executor), asio::execution::blocking_t::never),
-                                 asio::execution::relationship_t::fork, asio::execution::allocator(allocator)),
-                    static_cast<Function&&>(function));
+    detail::do_execute(
+        asio::prefer(asio::require(static_cast<Executor&&>(executor), asio::execution::blocking_t::never),
+                     asio::execution::relationship_t::fork, asio::execution::allocator(allocator)),
+        static_cast<Function&&>(function));
 }
 
 template <class CompletionHandler, class Function, class IOExecutor>
@@ -74,7 +76,7 @@ void complete_immediately(CompletionHandler&& completion_handler, Function&& fun
                 return (io_executor);
             }
         }());
-    detail::execute(
+    detail::do_execute(
         asio::prefer(std::move(executor), asio::execution::allocator(allocator)),
         [ch = static_cast<CompletionHandler&&>(completion_handler), f = static_cast<Function&&>(function)]() mutable
         {

diff --git a/src/agrpc/detail/work_tracking_completion_handler.hpp b/src/agrpc/detail/work_tracking_completion_handler.hpp
@@ -67,7 +67,7 @@ void dispatch_with_args(Handler&& handler, Args&&... args)
 {
     auto executor = asio::prefer(asio::get_associated_executor(handler), asio::execution::blocking_t::possibly,
                                  asio::execution::allocator(asio::get_associated_allocator(handler)));
-    detail::execute(
+    detail::do_execute(
         std::move(executor),
         [h = static_cast<Handler&&>(handler), arg_tuple = detail::Tuple{static_cast<Args&&>(args)...}]() mutable
         {

diff --git a/test/src/test_grpc_context_17.cpp b/test/src/test_grpc_context_17.cpp
@@ -496,14 +496,14 @@ TEST_CASE_FIXTURE(test::GrpcContextTest, "post/execute with allocator")
     }
     SUBCASE("asio::execute before grpc_context.run()")
     {
-        agrpc::detail::execute(get_tracking_allocator_executor(), test::NoOp{});
+        agrpc::detail::do_execute(get_tracking_allocator_executor(), test::NoOp{});
     }
     SUBCASE("asio::execute after grpc_context.run() from same thread")
     {
         asio::post(grpc_context,
                    [&, exec = get_tracking_allocator_executor()]
                    {
-                       agrpc::detail::execute(exec, test::NoOp{});
+                       agrpc::detail::do_execute(exec, test::NoOp{});
                    });
     }
     grpc_context.run();
@@ -541,7 +541,7 @@ TEST_CASE_FIXTURE(test::GrpcContextTest, "dispatch with allocator")
 TEST_CASE_FIXTURE(test::GrpcContextTest, "execute with throwing allocator")
 {
     const auto executor = asio::require(get_executor(), asio::execution::allocator(test::ThrowingAllocator<>{}));
-    CHECK_THROWS(agrpc::detail::execute(executor, test::NoOp{}));
+    CHECK_THROWS(agrpc::detail::do_execute(executor, test::NoOp{}));
 }
 
 TEST_CASE_FIXTURE(test::GrpcContextTest, "asio::post with throwing completion handler")