Fix conflicting filename

9 years ago · af541d8232
parent 1a8c52e479
commit af541d8232
11 changed files with 13 additions and 13 deletions
--- a/4
+++ b/4
@ -1367,7 +1367,7 @@ cc_library(
    "src/cpp/client/create_channel_posix.cc",
    "src/cpp/client/credentials_cc.cc",
    "src/cpp/client/generic_stub.cc",
-    "src/cpp/common/buffer_pool.cc",
+    "src/cpp/common/buffer_pool_cc.cc",
    "src/cpp/common/channel_arguments.cc",
    "src/cpp/common/channel_filter.cc",
    "src/cpp/common/completion_queue_cc.cc",
@ -1773,7 +1773,7 @@ cc_library(
    "src/cpp/client/create_channel_posix.cc",
    "src/cpp/client/credentials_cc.cc",
    "src/cpp/client/generic_stub.cc",
-    "src/cpp/common/buffer_pool.cc",
+    "src/cpp/common/buffer_pool_cc.cc",
    "src/cpp/common/channel_arguments.cc",
    "src/cpp/common/channel_filter.cc",
    "src/cpp/common/completion_queue_cc.cc",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1017,7 +1017,7 @@ add_library(grpc++
  src/cpp/client/create_channel_posix.cc
  src/cpp/client/credentials_cc.cc
  src/cpp/client/generic_stub.cc
-  src/cpp/common/buffer_pool.cc
+  src/cpp/common/buffer_pool_cc.cc
  src/cpp/common/channel_arguments.cc
  src/cpp/common/channel_filter.cc
  src/cpp/common/completion_queue_cc.cc
@ -1372,7 +1372,7 @@ add_library(grpc++_unsecure
  src/cpp/client/create_channel_posix.cc
  src/cpp/client/credentials_cc.cc
  src/cpp/client/generic_stub.cc
-  src/cpp/common/buffer_pool.cc
+  src/cpp/common/buffer_pool_cc.cc
  src/cpp/common/channel_arguments.cc
  src/cpp/common/channel_filter.cc
  src/cpp/common/completion_queue_cc.cc
--- a/4
+++ b/4
@ -3586,7 +3586,7 @@ LIBGRPC++_SRC = \
    src/cpp/client/create_channel_posix.cc \
    src/cpp/client/credentials_cc.cc \
    src/cpp/client/generic_stub.cc \
-    src/cpp/common/buffer_pool.cc \
+    src/cpp/common/buffer_pool_cc.cc \
    src/cpp/common/channel_arguments.cc \
    src/cpp/common/channel_filter.cc \
    src/cpp/common/completion_queue_cc.cc \
@ -4216,7 +4216,7 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/client/create_channel_posix.cc \
    src/cpp/client/credentials_cc.cc \
    src/cpp/client/generic_stub.cc \
-    src/cpp/common/buffer_pool.cc \
+    src/cpp/common/buffer_pool_cc.cc \
    src/cpp/common/channel_arguments.cc \
    src/cpp/common/channel_filter.cc \
    src/cpp/common/completion_queue_cc.cc \
--- a/build.yaml
+++ b/build.yaml
@ -721,7 +721,7 @@ filegroups:
  - src/cpp/client/create_channel_posix.cc
  - src/cpp/client/credentials_cc.cc
  - src/cpp/client/generic_stub.cc
-  - src/cpp/common/buffer_pool.cc
+  - src/cpp/common/buffer_pool_cc.cc
  - src/cpp/common/channel_arguments.cc
  - src/cpp/common/channel_filter.cc
  - src/cpp/common/completion_queue_cc.cc
--- a/src/cpp/common/buffer_pool_cc.cc
+++ b/src/cpp/common/buffer_pool_cc.cc
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -969,7 +969,7 @@ src/cpp/client/create_channel_internal.cc \
 src/cpp/client/create_channel_posix.cc \
 src/cpp/client/credentials_cc.cc \
 src/cpp/client/generic_stub.cc \
-src/cpp/common/buffer_pool.cc \
+src/cpp/common/buffer_pool_cc.cc \
 src/cpp/common/channel_arguments.cc \
 src/cpp/common/channel_filter.cc \
 src/cpp/common/completion_queue_cc.cc \
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -6930,7 +6930,7 @@
      "src/cpp/client/create_channel_posix.cc", 
      "src/cpp/client/credentials_cc.cc", 
      "src/cpp/client/generic_stub.cc", 
-      "src/cpp/common/buffer_pool.cc", 
+      "src/cpp/common/buffer_pool_cc.cc", 
      "src/cpp/common/channel_arguments.cc", 
      "src/cpp/common/channel_filter.cc", 
      "src/cpp/common/channel_filter.h", 
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@ -486,7 +486,7 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool_cc.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@ -46,7 +46,7 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
      <Filter>src\cpp\client</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool_cc.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@ -472,7 +472,7 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool_cc.cc">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@ -31,7 +31,7 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\client\generic_stub.cc">
      <Filter>src\cpp\client</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\buffer_pool_cc.cc">
      <Filter>src\cpp\common</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\channel_arguments.cc">