Remove unecessary files

pull/18730/head
Karthik Ravi Shankar 6 years ago
parent 973fa6950e
commit 2554f122c1
  1. 11
      include/grpcpp/impl/codegen/client_context.h.rej
  2. 14
      include/grpcpp/impl/codegen/completion_queue.h.rej
  3. 17
      include/grpcpp/impl/codegen/server_interface.h.rej
  4. 41
      include/grpcpp/security/credentials.h.rej
  5. 23
      src/cpp/client/channel_cc.cc.rej
  6. 13
      src/cpp/client/client_context.cc.rej
  7. 20
      src/cpp/client/create_channel.cc.rej
  8. 29
      src/cpp/client/create_channel_posix.cc.rej

@ -1,11 +0,0 @@
--- include/grpcpp/impl/codegen/client_context.h
+++ include/grpcpp/impl/codegen/client_context.h
@@ -461,7 +466,7 @@ class ClientContext {
bool wait_for_ready_explicitly_set_;
bool idempotent_;
bool cacheable_;
- std::shared_ptr<Channel> channel_;
+ std::shared_ptr<::grpc_impl::Channel> channel_;
std::mutex mu_;
grpc_call* call_;
bool call_canceled_;

@ -1,14 +0,0 @@
--- include/grpcpp/impl/codegen/completion_queue.h
+++ include/grpcpp/impl/codegen/completion_queue.h
@@ -41,6 +41,11 @@
struct grpc_completion_queue;
+namespace grpc_impl {
+
+class Channel;
+}
+
namespace grpc {
template <class R>

@ -1,17 +0,0 @@
--- include/grpcpp/impl/codegen/server_interface.h
+++ include/grpcpp/impl/codegen/server_interface.h
@@ -28,10 +28,13 @@
#include <grpcpp/impl/codegen/rpc_service_method.h>
#include <grpcpp/impl/codegen/server_context.h>
+namespace grpc_impl {
+class Channel;
+}
+
namespace grpc {
class AsyncGenericService;
-class Channel;
class GenericServerContext;
class ServerCompletionQueue;
class ServerContext;

@ -1,41 +0,0 @@
--- include/grpcpp/security/credentials.h
+++ include/grpcpp/security/credentials.h
@@ -32,9 +32,13 @@
struct grpc_call;
+namespace grpc_impl {
+
+class Channel;
+}
+
namespace grpc {
class ChannelArguments;
-class Channel;
class SecureChannelCredentials;
class CallCredentials;
class SecureCallCredentials;
@@ -42,7 +46,7 @@ class SecureCallCredentials;
class ChannelCredentials;
namespace experimental {
-std::shared_ptr<Channel> CreateCustomChannelWithInterceptors(
+std::shared_ptr<::grpc_impl::Channel> CreateCustomChannelWithInterceptors(
const grpc::string& target,
const std::shared_ptr<ChannelCredentials>& creds,
const ChannelArguments& args,
@@ -70,12 +74,12 @@ class ChannelCredentials : private GrpcLibraryCodegen {
virtual SecureChannelCredentials* AsSecureCredentials() = 0;
private:
- friend std::shared_ptr<Channel> CreateCustomChannel(
+ friend std::shared_ptr<::grpc_impl::Channel> CreateCustomChannel(
const grpc::string& target,
const std::shared_ptr<ChannelCredentials>& creds,
const ChannelArguments& args);
- friend std::shared_ptr<Channel>
+ friend std::shared_ptr<::grpc_impl::Channel>
experimental::CreateCustomChannelWithInterceptors(
const grpc::string& target,
const std::shared_ptr<ChannelCredentials>& creds,

@ -1,23 +0,0 @@
--- src/cpp/client/channel_cc.cc
+++ src/cpp/client/channel_cc.cc
@@ -236,17 +240,17 @@ class ShutdownCallback : public grpc_experimental_completion_queue_functor {
}
private:
- CompletionQueue* cq_ = nullptr;
+ ::grpc::CompletionQueue* cq_ = nullptr;
};
} // namespace
-CompletionQueue* Channel::CallbackCQ() {
+::grpc::CompletionQueue* Channel::CallbackCQ() {
// TODO(vjpai): Consider using a single global CQ for the default CQ
// if there is no explicit per-channel CQ registered
std::lock_guard<std::mutex> l(mu_);
if (callback_cq_ == nullptr) {
auto* shutdown_callback = new ShutdownCallback;
- callback_cq_ = new CompletionQueue(grpc_completion_queue_attributes{
+ callback_cq_ = new ::grpc::CompletionQueue(grpc_completion_queue_attributes{
GRPC_CQ_CURRENT_VERSION, GRPC_CQ_CALLBACK, GRPC_CQ_DEFAULT_POLLING,
shutdown_callback});

@ -1,13 +0,0 @@
--- src/cpp/client/client_context.cc
+++ src/cpp/client/client_context.cc
@@ -87,8 +92,8 @@ void ClientContext::AddMetadata(const grpc::string& meta_key,
send_initial_metadata_.insert(std::make_pair(meta_key, meta_value));
}
-void ClientContext::set_call(grpc_call* call,
- const std::shared_ptr<Channel>& channel) {
+void ClientContext::set_call(
+ grpc_call* call, const std::shared_ptr<::grpc_impl::Channel>& channel) {
std::unique_lock<std::mutex> lock(mu_);
GPR_ASSERT(call_ == nullptr);
call_ = call;

@ -1,20 +0,0 @@
--- src/cpp/client/create_channel.cc
+++ src/cpp/client/create_channel.cc
@@ -40,7 +40,7 @@ std::shared_ptr<Channel> CreateCustomChannel(
const ChannelArguments& args) {
GrpcLibraryCodegen init_lib; // We need to call init in case of a bad creds.
return creds ? creds->CreateChannel(target, args)
- : CreateChannelInternal(
+ : ::grpc_impl::CreateChannelInternal(
"",
grpc_lame_client_channel_create(
nullptr, GRPC_STATUS_INVALID_ARGUMENT,
@@ -70,7 +70,7 @@ std::shared_ptr<Channel> CreateCustomChannelWithInterceptors(
interceptor_creators) {
return creds ? creds->CreateChannelWithInterceptors(
target, args, std::move(interceptor_creators))
- : CreateChannelInternal(
+ : ::grpc_impl::CreateChannelInternal(
"",
grpc_lame_client_channel_create(
nullptr, GRPC_STATUS_INVALID_ARGUMENT,

@ -1,29 +0,0 @@
--- src/cpp/client/create_channel_posix.cc
+++ src/cpp/client/create_channel_posix.cc
@@ -32,7 +32,7 @@ std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target,
int fd) {
internal::GrpcLibrary init_lib;
init_lib.init();
- return CreateChannelInternal(
+ return ::grpc_impl::CreateChannelInternal(
"", grpc_insecure_channel_create_from_fd(target.c_str(), fd, nullptr),
std::vector<
std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>());
@@ -44,7 +44,7 @@ std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd(
init_lib.init();
grpc_channel_args channel_args;
args.SetChannelArgs(&channel_args);
- return CreateChannelInternal(
+ return ::grpc_impl::CreateChannelInternal(
"",
grpc_insecure_channel_create_from_fd(target.c_str(), fd, &channel_args),
std::vector<
@@ -62,7 +62,7 @@ std::shared_ptr<Channel> CreateCustomInsecureChannelWithInterceptorsFromFd(
init_lib.init();
grpc_channel_args channel_args;
args.SetChannelArgs(&channel_args);
- return CreateChannelInternal(
+ return ::grpc_impl::CreateChannelInternal(
"",
grpc_insecure_channel_create_from_fd(target.c_str(), fd, &channel_args),
std::move(interceptor_creators));
Loading…
Cancel
Save