Don't move ServerContext to impl

6 years ago · bddcb6c906
parent 748b932d02
commit bddcb6c906
10 changed files with 0 additions and 38 deletions
--- a/1
+++ b/1
@ -265,7 +265,6 @@ GRPCXX_PUBLIC_HDRS = [
    "include/grpcpp/server_builder.h",
    "include/grpcpp/server_builder_impl.h",
    "include/grpcpp/server_context.h",
-    "include/grpcpp/server_context_impl.h",
    "include/grpcpp/server_posix.h",
    "include/grpcpp/server_posix_impl.h",
    "include/grpcpp/support/async_stream.h",
--- a/BUILD.gn
+++ b/BUILD.gn
@ -1119,7 +1119,6 @@ config("grpc_config") {
        "include/grpcpp/server_builder.h",
        "include/grpcpp/server_builder_impl.h",
        "include/grpcpp/server_context.h",
-        "include/grpcpp/server_context_impl.h",
        "include/grpcpp/server_impl.h",
        "include/grpcpp/server_posix.h",
        "include/grpcpp/server_posix_impl.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3200,7 +3200,6 @@ foreach(_hdr
  include/grpcpp/server_builder.h
  include/grpcpp/server_builder_impl.h
  include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
  include/grpcpp/server_impl.h
  include/grpcpp/server_posix.h
  include/grpcpp/server_posix_impl.h
@ -3823,7 +3822,6 @@ foreach(_hdr
  include/grpcpp/server_builder.h
  include/grpcpp/server_builder_impl.h
  include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
  include/grpcpp/server_impl.h
  include/grpcpp/server_posix.h
  include/grpcpp/server_posix_impl.h
@ -4824,7 +4822,6 @@ foreach(_hdr
  include/grpcpp/server_builder.h
  include/grpcpp/server_builder_impl.h
  include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
  include/grpcpp/server_impl.h
  include/grpcpp/server_posix.h
  include/grpcpp/server_posix_impl.h
--- a/3
+++ b/3
@ -5574,7 +5574,6 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/server_builder.h \
    include/grpcpp/server_builder_impl.h \
    include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
    include/grpcpp/server_impl.h \
    include/grpcpp/server_posix.h \
    include/grpcpp/server_posix_impl.h \
@ -6205,7 +6204,6 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/server_builder.h \
    include/grpcpp/server_builder_impl.h \
    include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
    include/grpcpp/server_impl.h \
    include/grpcpp/server_posix.h \
    include/grpcpp/server_posix_impl.h \
@ -7155,7 +7153,6 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/server_builder.h \
    include/grpcpp/server_builder_impl.h \
    include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
    include/grpcpp/server_impl.h \
    include/grpcpp/server_posix.h \
    include/grpcpp/server_posix_impl.h \
--- a/build.yaml
+++ b/build.yaml
@ -1406,7 +1406,6 @@ filegroups:
  - include/grpcpp/server_builder.h
  - include/grpcpp/server_builder_impl.h
  - include/grpcpp/server_context.h
-  - include/grpcpp/server_context_impl.h
  - include/grpcpp/server_impl.h
  - include/grpcpp/server_posix.h
  - include/grpcpp/server_posix_impl.h
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -125,7 +125,6 @@ Pod::Spec.new do |s|
                      'include/grpcpp/server_builder.h',
                      'include/grpcpp/server_builder_impl.h',
                      'include/grpcpp/server_context.h',
-                      'include/grpcpp/server_context_impl.h',
                      'include/grpcpp/server_impl.h',
                      'include/grpcpp/server_posix.h',
                      'include/grpcpp/server_posix_impl.h',
--- a/include/grpcpp/server_context_impl.h
+++ b/include/grpcpp/server_context_impl.h
@ -1,24 +0,0 @@
-/*
- *
- * Copyright 2019 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_CONTEXT_IMPL_H
-#define GRPCPP_SERVER_CONTEXT_IMPL_H
-
-#include <grpcpp/impl/codegen/server_context_impl.h>
-
-#endif  // GRPCPP_SERVER_CONTEXT_IMPL_H
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -1020,7 +1020,6 @@ include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
-include/grpcpp/server_context_impl.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
 include/grpcpp/server_posix_impl.h \
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1022,7 +1022,6 @@ include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
-include/grpcpp/server_context_impl.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
 include/grpcpp/server_posix_impl.h \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -10421,7 +10421,6 @@
      "include/grpcpp/server_builder.h", 
      "include/grpcpp/server_builder_impl.h", 
      "include/grpcpp/server_context.h", 
-      "include/grpcpp/server_context_impl.h", 
      "include/grpcpp/server_impl.h", 
      "include/grpcpp/server_posix.h", 
      "include/grpcpp/server_posix_impl.h", 
@ -10550,7 +10549,6 @@
      "include/grpcpp/server_builder.h", 
      "include/grpcpp/server_builder_impl.h", 
      "include/grpcpp/server_context.h", 
-      "include/grpcpp/server_context_impl.h", 
      "include/grpcpp/server_impl.h", 
      "include/grpcpp/server_posix.h", 
      "include/grpcpp/server_posix_impl.h",