From 8d2207da4d72d9fbbf4b512484a2458722e45459 Mon Sep 17 00:00:00 2001
From: Karthik Ravi Shankar <karthikrs@google.com>
Date: Thu, 21 Mar 2019 17:36:19 -0700
Subject: [PATCH] WIP: New changes to make namespace work

---
 include/grpcpp/create_channel.h        | 5 +++--
 include/grpcpp/create_channel_impl.h   | 2 +-
 src/cpp/client/create_channel.cc       | 4 ++--
 src/cpp/client/create_channel_posix.cc | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/grpcpp/create_channel.h b/include/grpcpp/create_channel.h
index d9d7d432c3f..b9e31a63d39 100644
--- a/include/grpcpp/create_channel.h
+++ b/include/grpcpp/create_channel.h
@@ -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);
 }
diff --git a/include/grpcpp/create_channel_impl.h b/include/grpcpp/create_channel_impl.h
index 84dd2f7c765..e44a82b1426 100644
--- a/include/grpcpp/create_channel_impl.h
+++ b/include/grpcpp/create_channel_impl.h
@@ -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);
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc
index c217dccac9c..bafdcec99a1 100644
--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@@ -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"
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc
index 6de373577eb..8f74794de79 100644
--- a/src/cpp/client/create_channel_posix.cc
+++ b/src/cpp/client/create_channel_posix.cc
@@ -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"