Fix merge failures

10 years ago · 9d1f0c4a0c
parent 3db9d01729
commit 9d1f0c4a0c
6 changed files with 17 additions and 19 deletions
--- a/4
+++ b/4
@ -854,8 +854,8 @@ cc_library(
 cc_library(
  name = "grpc_plugin_support",
  srcs = [
-    "include/grpc++/config.h",
-    "include/grpc++/config_protobuf.h",
+    "include/grpc++/support/config.h",
+    "include/grpc++/support/config_protobuf.h",
    "src/compiler/config.h",
    "src/compiler/cpp_generator.h",
    "src/compiler/cpp_generator_helpers.h",
--- a/build.json
+++ b/build.json
@ -697,8 +697,8 @@
      "build": "protoc",
      "language": "c++",
      "headers": [
-        "include/grpc++/config.h",
-        "include/grpc++/config_protobuf.h",
+        "include/grpc++/support/config.h",
+        "include/grpc++/support/config_protobuf.h",
        "src/compiler/config.h",
        "src/compiler/cpp_generator.h",
        "src/compiler/cpp_generator_helpers.h",
--- a/src/cpp/server/dynamic_thread_pool.h
+++ b/src/cpp/server/dynamic_thread_pool.h
@ -34,15 +34,14 @@
 #ifndef GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H
 #define GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H

-#include <grpc++/config.h>
-
-#include <grpc++/impl/sync.h>
-#include <grpc++/impl/thd.h>
-
 #include <list>
 #include <memory>
 #include <queue>

+#include <grpc++/impl/sync.h>
+#include <grpc++/impl/thd.h>
+#include <grpc++/support/config.h>
+
 #include "src/cpp/server/thread_pool_interface.h"

 namespace grpc {
--- a/src/cpp/server/fixed_size_thread_pool.h
+++ b/src/cpp/server/fixed_size_thread_pool.h
@ -34,13 +34,12 @@
 #ifndef GRPC_INTERNAL_CPP_FIXED_SIZE_THREAD_POOL_H
 #define GRPC_INTERNAL_CPP_FIXED_SIZE_THREAD_POOL_H

-#include <grpc++/config.h>
+#include <queue>
+#include <vector>

 #include <grpc++/impl/sync.h>
 #include <grpc++/impl/thd.h>
-
-#include <queue>
-#include <vector>
+#include <grpc++/support/config.h>

 #include "src/cpp/server/thread_pool_interface.h"

--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -13396,8 +13396,8 @@
  {
    "deps": [], 
    "headers": [
-      "include/grpc++/config.h", 
-      "include/grpc++/config_protobuf.h", 
+      "include/grpc++/support/config.h", 
+      "include/grpc++/support/config_protobuf.h", 
      "src/compiler/config.h", 
      "src/compiler/cpp_generator.h", 
      "src/compiler/cpp_generator_helpers.h", 
@ -13415,8 +13415,8 @@
    "language": "c++", 
    "name": "grpc_plugin_support", 
    "src": [
-      "include/grpc++/config.h", 
-      "include/grpc++/config_protobuf.h", 
+      "include/grpc++/support/config.h", 
+      "include/grpc++/support/config_protobuf.h", 
      "src/compiler/config.h", 
      "src/compiler/cpp_generator.cc", 
      "src/compiler/cpp_generator.h", 
--- a/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj
+++ b/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj
@ -122,8 +122,8 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\include\grpc++\config.h" />
-    <ClInclude Include="..\..\include\grpc++\config_protobuf.h" />
+    <ClInclude Include="..\..\include\grpc++\support\config.h" />
+    <ClInclude Include="..\..\include\grpc++\support\config_protobuf.h" />
    <ClInclude Include="..\..\src\compiler\config.h" />
    <ClInclude Include="..\..\src\compiler\cpp_generator.h" />
    <ClInclude Include="..\..\src\compiler\cpp_generator_helpers.h" />