WIP: New changes to make namespace work

pull/18444/head
Karthik Ravi Shankar 6 years ago
parent 603d014f0e
commit 8d2207da4d
  1. 5
      include/grpcpp/create_channel.h
  2. 2
      include/grpcpp/create_channel_impl.h
  3. 4
      src/cpp/client/create_channel.cc
  4. 2
      src/cpp/client/create_channel_posix.cc

@ -19,6 +19,7 @@
#ifndef GRPCPP_CREATE_CHANNEL_H
#define GRPCPP_CREATE_CHANNEL_H
#include <grpcpp/support/channel_arguments.h>
#include <grpcpp/create_channel_impl.h>
namespace grpc {
@ -29,9 +30,9 @@ static inline std::shared_ptr<Channel> CreateChannel(
return ::grpc_impl::CreateChannelImpl(target, creds);
}
static inline std::shared_ptr<Channel> CreateCustomChannel(
static inline std::shared_ptr<::grpc::Channel> CreateCustomChannel(
const grpc::string& target,
const std::shared_ptr<ChannelCredentials>& creds,
const std::shared_ptr<grpc::ChannelCredentials>& creds,
const ChannelArguments& args) {
return ::grpc_impl::CreateCustomChannelImpl(target, creds, args);
}

@ -49,7 +49,7 @@ std::shared_ptr<grpc::Channel> CreateChannelImpl(
/// hold an object or is invalid, a lame channel (one on which all operations
/// fail) is returned.
/// \param args Options for channel creation.
std::shared_ptr<grpc::Channel> CreateCustomChannelImpl(
std::shared_ptr<grpc::Channel> CreateCustomChannel(
const grpc::string& target,
const std::shared_ptr<grpc::ChannelCredentials>& creds,
const grpc::ChannelArguments& args);

@ -19,9 +19,9 @@
#include <memory>
#include <grpcpp/channel.h>
#include <grpcpp/create_channel_impl.h>
#include <grpcpp/impl/grpc_library.h>
#include <grpcpp/create_channel.h>
#include <grpcpp/security/credentials.h>
#include <grpcpp/impl/grpc_library.h>
#include <grpcpp/support/channel_arguments.h>
#include "src/cpp/client/create_channel_internal.h"

@ -19,7 +19,7 @@
#include <grpc/grpc.h>
#include <grpc/grpc_posix.h>
#include <grpcpp/channel.h>
#include <grpcpp/create_channel.h>
#include <grpcpp/support/channel_arguments.h>
#include <grpcpp/impl/grpc_library.h>
#include "src/cpp/client/create_channel_internal.h"

Loading…
Cancel
Save