Add transitional and temporary include file to merge

grpc and grpc::internal namespaces while versions of gRPC
are in transition

PiperOrigin-RevId: 173317900

2 files changed, 14 insertions, 5 deletions

diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
index a1fbea57dd..cff765d1e8 100644
--- a/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
@@ -43,21 +43,21 @@ VerbsService::Stub::Stub(
     const std::shared_ptr< ::grpc::ChannelInterface>& channel)
     : channel_(channel),
       rpcmethod_GetRemoteAddress_(grpcVerbsService_method_names[0],
-                                  ::grpc::internal::RpcMethod::NORMAL_RPC,
+                                  ::grpc::RpcMethod::NORMAL_RPC,
                                   channel) {}
 
 ::grpc::Status VerbsService::Stub::GetRemoteAddress(
     ::grpc::ClientContext* context, const GetRemoteAddressRequest& request,
     GetRemoteAddressResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall(
+  return ::grpc::BlockingUnaryCall(
       channel_.get(), rpcmethod_GetRemoteAddress_, context, request, response);
 }
 
 VerbsService::AsyncService::AsyncService() {
   for (int i = 0; i < 1; ++i) {
-    AddMethod(new ::grpc::internal::RpcServiceMethod(
+    AddMethod(new ::grpc::RpcServiceMethod(
         grpcVerbsService_method_names[i],
-        ::grpc::internal::RpcMethod::NORMAL_RPC,
+        ::grpc::RpcMethod::NORMAL_RPC,
         nullptr));
     ::grpc::Service::MarkMethodAsync(i);
   }
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.h b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
index 86431ca030..6e2bf86dac 100644
--- a/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
@@ -28,6 +28,15 @@ limitations under the License.
 #include "tensorflow/contrib/verbs/verbs_service.pb.h"
 
 namespace grpc {
+
+// ensure internal namespace exists
+namespace internal {
+// bring in contents of external namespace
+using namespace ::grpc;
+}  // namespace internal
+// bring in contents of internal namespace
+using namespace internal;
+
 class CompletionQueue;
 class Channel;
 class RpcService;
@@ -61,7 +70,7 @@ class VerbsService GRPC_FINAL {
 
    private:
     std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    const ::grpc::internal::RpcMethod rpcmethod_GetRemoteAddress_;
+    const ::grpc::RpcMethod rpcmethod_GetRemoteAddress_;
   };
   static std::unique_ptr<Stub> NewStub(
       const std::shared_ptr< ::grpc::ChannelInterface>& channel,