From 1d22e8fc81d8a68b8ed359020b7811b9b8b3cc48 Mon Sep 17 00:00:00 2001
From: Karthik Ravi Shankar <karthikrs@google.com>
Date: Wed, 5 Aug 2020 15:44:31 -0700
Subject: [PATCH] Make fixes to ChannelArguments namespace
---
include/grpcpp/server_impl.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/grpcpp/server_impl.h b/include/grpcpp/server_impl.h
index 8e9ea091873..683231b64d6 100644
--- a/include/grpcpp/server_impl.h
+++ b/include/grpcpp/server_impl.h
@@ -109,7 +109,7 @@ class Server : public grpc::ServerInterface, private grpc::GrpcLibraryCodegen {
}
/// Establish a channel for in-process communication
- std::shared_ptr<grpc::Channel> InProcessChannel(const ChannelArguments& args);
+ std::shared_ptr<grpc::Channel> InProcessChannel(const grpc::ChannelArguments& args);
/// NOTE: class experimental_type is not part of the public API of this class.
/// TODO(yashykt): Integrate into public API when this is no longer
@@ -121,7 +121,7 @@ class Server : public grpc::ServerInterface, private grpc::GrpcLibraryCodegen {
/// Establish a channel for in-process communication with client
/// interceptors
std::shared_ptr<grpc::Channel> InProcessChannelWithInterceptors(
- const ChannelArguments& args,
+ const grpc::ChannelArguments& args,
std::vector<std::unique_ptr<
grpc::experimental::ClientInterceptorFactoryInterface>>
interceptor_creators);
@@ -180,7 +180,7 @@ class Server : public grpc::ServerInterface, private grpc::GrpcLibraryCodegen {
/// \param sync_cq_timeout_msec The timeout to use when calling AsyncNext() on
/// server completion queues passed via sync_server_cqs param.
Server(
- ChannelArguments* args,
+ grpc::ChannelArguments* args,
std::shared_ptr<std::vector<std::unique_ptr<grpc::ServerCompletionQueue>>>
sync_server_cqs,
int min_pollers, int max_pollers, int sync_cq_timeout_msec,