Merge pull request #23304 from karthikravis/server-posix

Move server posix from ::grpc_impl to ::grpc

BUILD

@@ -264,7 +264,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/server_builder_impl.h",
     "include/grpcpp/server_context.h",
     "include/grpcpp/server_posix.h",
-    "include/grpcpp/server_posix_impl.h",
     "include/grpcpp/support/async_stream.h",
     "include/grpcpp/support/async_stream_impl.h",
     "include/grpcpp/support/async_unary_call.h",

BUILD.gn

@@ -1323,7 +1323,6 @@ config("grpc_config") {
         "include/grpcpp/server_context.h",
         "include/grpcpp/server_impl.h",
         "include/grpcpp/server_posix.h",
-        "include/grpcpp/server_posix_impl.h",
         "include/grpcpp/support/async_stream.h",
         "include/grpcpp/support/async_stream_impl.h",
         "include/grpcpp/support/async_unary_call.h",

CMakeLists.txt

@@ -2887,7 +2887,6 @@ foreach(_hdr
   include/grpcpp/server_context.h
   include/grpcpp/server_impl.h
   include/grpcpp/server_posix.h
-  include/grpcpp/server_posix_impl.h
   include/grpcpp/support/async_stream.h
   include/grpcpp/support/async_stream_impl.h
   include/grpcpp/support/async_unary_call.h
@@ -3580,7 +3579,6 @@ foreach(_hdr
   include/grpcpp/server_context.h
   include/grpcpp/server_impl.h
   include/grpcpp/server_posix.h
-  include/grpcpp/server_posix_impl.h
   include/grpcpp/support/async_stream.h
   include/grpcpp/support/async_stream_impl.h
   include/grpcpp/support/async_unary_call.h

Makefile

@@ -5084,7 +5084,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/server_context.h \
     include/grpcpp/server_impl.h \
     include/grpcpp/server_posix.h \
-    include/grpcpp/server_posix_impl.h \
     include/grpcpp/support/async_stream.h \
     include/grpcpp/support/async_stream_impl.h \
     include/grpcpp/support/async_unary_call.h \
@@ -5782,7 +5781,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/server_context.h \
     include/grpcpp/server_impl.h \
     include/grpcpp/server_posix.h \
-    include/grpcpp/server_posix_impl.h \
     include/grpcpp/support/async_stream.h \
     include/grpcpp/support/async_stream_impl.h \
     include/grpcpp/support/async_unary_call.h \

build_autogenerated.yaml

@@ -2431,7 +2431,6 @@ libs:
   - include/grpcpp/server_context.h
   - include/grpcpp/server_impl.h
   - include/grpcpp/server_posix.h
-  - include/grpcpp/server_posix_impl.h
   - include/grpcpp/support/async_stream.h
   - include/grpcpp/support/async_stream_impl.h
   - include/grpcpp/support/async_unary_call.h
@@ -2823,7 +2822,6 @@ libs:
   - include/grpcpp/server_context.h
   - include/grpcpp/server_impl.h
   - include/grpcpp/server_posix.h
-  - include/grpcpp/server_posix_impl.h
   - include/grpcpp/support/async_stream.h
   - include/grpcpp/support/async_stream_impl.h
   - include/grpcpp/support/async_unary_call.h

gRPC-C++.podspec

@@ -177,7 +177,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/server_context.h',
                       'include/grpcpp/server_impl.h',
                       'include/grpcpp/server_posix.h',
-                      'include/grpcpp/server_posix_impl.h',
                       'include/grpcpp/support/async_stream.h',
                       'include/grpcpp/support/async_stream_impl.h',
                       'include/grpcpp/support/async_unary_call.h',

include/grpcpp/server_posix.h

@@ -19,15 +19,21 @@
 #ifndef GRPCPP_SERVER_POSIX_H
 #define GRPCPP_SERVER_POSIX_H
 
-#include <grpcpp/server_posix_impl.h>
+#include <memory>
+
+#include <grpc/support/port_platform.h>
+#include <grpcpp/server.h>
 
 namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 
-static inline void AddInsecureChannelFromFd(Server* server, int fd) {
+/// Add a new client to a \a Server communicating over the given
-  ::grpc_impl::AddInsecureChannelFromFd(server, fd);
+/// file descriptor.
-}
+///
+/// \param server The server to add the client to.
+/// \param fd The file descriptor representing a socket.
+void AddInsecureChannelFromFd(Server* server, int fd);
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD
 

include/grpcpp/server_posix_impl.h

@@ -1,42 +0,0 @@
-/*
- *
- * Copyright 2016 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPCPP_SERVER_POSIX_IMPL_H
-#define GRPCPP_SERVER_POSIX_IMPL_H
-
-#include <memory>
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/server.h>
-
-namespace grpc_impl {
-
-#ifdef GPR_SUPPORT_CHANNELS_FROM_FD
-
-/// Add a new client to a \a Server communicating over the given
-/// file descriptor.
-///
-/// \param server The server to add the client to.
-/// \param fd The file descriptor representing a socket.
-void AddInsecureChannelFromFd(grpc::Server* server, int fd);
-
-#endif  // GPR_SUPPORT_CHANNELS_FROM_FD
-
-}  // namespace grpc_impl
-
-#endif  // GRPCPP_SERVER_POSIX_IMPL_H

src/cpp/server/server_posix.cc

@@ -20,7 +20,7 @@
 
 #include <grpc/grpc_posix.h>
 
-namespace grpc_impl {
+namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
 
@@ -30,4 +30,4 @@ void AddInsecureChannelFromFd(grpc::Server* server, int fd) {
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD
 
-}  // namespace grpc_impl
+}  // namespace grpc

tools/doxygen/Doxyfile.c++

@@ -1037,7 +1037,6 @@ include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
-include/grpcpp/server_posix_impl.h \
 include/grpcpp/support/async_stream.h \
 include/grpcpp/support/async_stream_impl.h \
 include/grpcpp/support/async_unary_call.h \

tools/doxygen/Doxyfile.c++.internal

@@ -1037,7 +1037,6 @@ include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
-include/grpcpp/server_posix_impl.h \
 include/grpcpp/support/async_stream.h \
 include/grpcpp/support/async_stream_impl.h \
 include/grpcpp/support/async_unary_call.h \