aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD6
-rw-r--r--Makefile6
-rw-r--r--build.yaml2
-rw-r--r--tools/doxygen/Doxyfile.c++3
-rw-r--r--tools/doxygen/Doxyfile.c++.internal3
-rw-r--r--tools/run_tests/sources_and_headers.json12
-rw-r--r--vsprojects/vcxproj/grpc++/grpc++.vcxproj3
-rw-r--r--vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters19
-rw-r--r--vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj3
-rw-r--r--vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters19
10 files changed, 35 insertions, 41 deletions
diff --git a/BUILD b/BUILD
index 9eb3d978ef..f511b28a73 100644
--- a/BUILD
+++ b/BUILD
@@ -784,7 +784,8 @@ cc_library(
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
@@ -879,7 +880,8 @@ cc_library(
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
diff --git a/Makefile b/Makefile
index 0e4847c44f..31fb2c88b1 100644
--- a/Makefile
+++ b/Makefile
@@ -2990,7 +2990,8 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
- include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h \
+ include/grpc++/impl/codegen/channel_interface.h \
+ include/grpc++/impl/codegen/server_interface.h \
include/grpc++/impl/grpc_library.h \
include/grpc++/impl/method_handler_impl.h \
include/grpc++/impl/proto_utils.h \
@@ -3261,7 +3262,8 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
- include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h \
+ include/grpc++/impl/codegen/channel_interface.h \
+ include/grpc++/impl/codegen/server_interface.h \
include/grpc++/impl/grpc_library.h \
include/grpc++/impl/method_handler_impl.h \
include/grpc++/impl/proto_utils.h \
diff --git a/build.yaml b/build.yaml
index 39ddf24a24..24fa7a1be1 100644
--- a/build.yaml
+++ b/build.yaml
@@ -32,8 +32,8 @@ filegroups:
- include/grpc++/grpc++.h
- include/grpc++/impl/call.h
- include/grpc++/impl/client_unary_call.h
- - include/grpc++/impl/codegen/server_interface.h
- include/grpc++/impl/codegen/channel_interface.h
+ - include/grpc++/impl/codegen/server_interface.h
- include/grpc++/impl/grpc_library.h
- include/grpc++/impl/method_handler_impl.h
- include/grpc++/impl/proto_utils.h
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 0f36810f15..09da8812f5 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -769,7 +769,8 @@ include/grpc++/generic/generic_stub.h \
include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
-include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h \
+include/grpc++/impl/codegen/channel_interface.h \
+include/grpc++/impl/codegen/server_interface.h \
include/grpc++/impl/grpc_library.h \
include/grpc++/impl/method_handler_impl.h \
include/grpc++/impl/proto_utils.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index a0013708ba..7ec8a0e695 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -769,7 +769,8 @@ include/grpc++/generic/generic_stub.h \
include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
-include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h \
+include/grpc++/impl/codegen/channel_interface.h \
+include/grpc++/impl/codegen/server_interface.h \
include/grpc++/impl/grpc_library.h \
include/grpc++/impl/method_handler_impl.h \
include/grpc++/impl/proto_utils.h \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index a4784cf7f9..19c3fb689f 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -3844,7 +3844,8 @@
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
@@ -3900,7 +3901,8 @@
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
@@ -4040,7 +4042,8 @@
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
@@ -4093,7 +4096,8 @@
"include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
- "include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/channel_interface.h",
+ "include/grpc++/impl/codegen/server_interface.h",
"include/grpc++/impl/grpc_library.h",
"include/grpc++/impl/method_handler_impl.h",
"include/grpc++/impl/proto_utils.h",
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
index c0ce85cd54..2f6dce0e9b 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@@ -267,7 +267,8 @@
<ClInclude Include="$(SolutionDir)\..\include\grpc++\grpc++.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\call.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h" />
- <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen\channel_interface.h" />
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h" />
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\method_handler_impl.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\proto_utils.h" />
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
index c6846f2feb..8c00ea846b 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@@ -126,8 +126,11 @@
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h">
<Filter>include\grpc++\impl</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen\channel_interface.h">
- <Filter>include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen</Filter>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h">
+ <Filter>include\grpc++\impl\codegen</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h">
+ <Filter>include\grpc++\impl\codegen</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h">
<Filter>include\grpc++\impl</Filter>
@@ -275,18 +278,6 @@
<Filter Include="include\grpc++\impl\codegen">
<UniqueIdentifier>{a3e7f28b-a7c7-7364-d402-edb1bfa414a4}</UniqueIdentifier>
</Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include">
- <UniqueIdentifier>{1bd5ab1d-9021-ccc8-6db4-faca13506a7e}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++">
- <UniqueIdentifier>{198172ca-33d7-4e74-2bc5-5b9413bcdf9a}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++\impl">
- <UniqueIdentifier>{fd299734-d80f-7c64-d6fe-6575e43e1671}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen">
- <UniqueIdentifier>{d4f84f05-bc1e-4991-a484-ee9accf7d253}</UniqueIdentifier>
- </Filter>
<Filter Include="include\grpc++\security">
<UniqueIdentifier>{a80eb32b-1be9-1187-5f40-30d92accecc8}</UniqueIdentifier>
</Filter>
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
index 952d694ecf..1aed7b98bf 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@@ -267,7 +267,8 @@
<ClInclude Include="$(SolutionDir)\..\include\grpc++\grpc++.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\call.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h" />
- <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen\channel_interface.h" />
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h" />
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\method_handler_impl.h" />
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\proto_utils.h" />
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
index 400308412b..8d1a5174dd 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@@ -111,8 +111,11 @@
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\client_unary_call.h">
<Filter>include\grpc++\impl</Filter>
</ClInclude>
- <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen\channel_interface.h">
- <Filter>include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen</Filter>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\channel_interface.h">
+ <Filter>include\grpc++\impl\codegen</Filter>
+ </ClInclude>
+ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\server_interface.h">
+ <Filter>include\grpc++\impl\codegen</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\grpc_library.h">
<Filter>include\grpc++\impl</Filter>
@@ -251,18 +254,6 @@
<Filter Include="include\grpc++\impl\codegen">
<UniqueIdentifier>{ccc364e2-3f28-8bfc-c26e-800dd6f9a9af}</UniqueIdentifier>
</Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include">
- <UniqueIdentifier>{e3fe409b-c3cb-f341-789e-d96b9737d899}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++">
- <UniqueIdentifier>{1c3328a6-193d-8846-6617-5bf6af920936}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++\impl">
- <UniqueIdentifier>{a87212e6-4424-59a8-fccc-1939da7f2a3d}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\grpc++\impl\codegen\server_interface.h include\grpc++\impl\codegen">
- <UniqueIdentifier>{e2d46a3d-3f7b-316d-b1c7-5499922fa7ed}</UniqueIdentifier>
- </Filter>
<Filter Include="include\grpc++\security">
<UniqueIdentifier>{64bf60ff-9192-bb59-dcc8-8a0021e1d016}</UniqueIdentifier>
</Filter>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 18:06:59 +0000