diff options
| author |  yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
| commit | 5ea46ab2482c3724fbc7fd0aab55f324fb65999c (patch) | |
| tree | 55eebc4aae8f06f931c8f75ddf84d56595f99fa1 /vsprojects/grpc++_unsecure | |
| parent | 3abe60b9d08ff5a784a39f7c4a10c631547c3526 (diff) | |
| parent | d426864934ac60f46e538ba81932e405fa8949b1 (diff) | |
merge with upstream and resolve conflicts
Diffstat (limited to 'vsprojects/grpc++_unsecure')
| -rw-r--r-- | vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj | 6 | ||||
| -rw-r--r-- | vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj index 52431b67a2..984fb6884e 100644 --- a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -155,6 +155,7 @@ <ClInclude Include="..\..\include\grpc++\client_context.h" /> <ClInclude Include="..\..\include\grpc++\completion_queue.h" /> <ClInclude Include="..\..\include\grpc++\config.h" /> + <ClInclude Include="..\..\include\grpc++\config_protobuf.h" /> <ClInclude Include="..\..\include\grpc++\create_channel.h" /> <ClInclude Include="..\..\include\grpc++\credentials.h" /> <ClInclude Include="..\..\include\grpc++\generic_stub.h" /> @@ -162,8 +163,10 @@ <ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h" /> <ClInclude Include="..\..\include\grpc++\impl\grpc_library.h" /> <ClInclude Include="..\..\include\grpc++\impl\internal_stub.h" /> + <ClInclude Include="..\..\include\grpc++\impl\proto_utils.h" /> <ClInclude Include="..\..\include\grpc++\impl\rpc_method.h" /> <ClInclude Include="..\..\include\grpc++\impl\rpc_service_method.h" /> + <ClInclude Include="..\..\include\grpc++\impl\serialization_traits.h" /> <ClInclude Include="..\..\include\grpc++\impl\service_type.h" /> <ClInclude Include="..\..\include\grpc++\impl\sync.h" /> <ClInclude Include="..\..\include\grpc++\impl\sync_cxx11.h" /> @@ -186,7 +189,6 @@ <ClInclude Include="..\..\src\cpp\common\insecure_auth_context.h" /> <ClInclude Include="..\..\src\cpp\client\channel.h" /> <ClInclude Include="..\..\src\cpp\common\create_auth_context.h" /> - <ClInclude Include="..\..\src\cpp\proto\proto_utils.h" /> <ClInclude Include="..\..\src\cpp\server\thread_pool.h" /> </ItemGroup> <ItemGroup> @@ -198,8 +200,6 @@ </ClCompile> <ClCompile Include="..\..\src\cpp\client\client_context.cc"> </ClCompile> - <ClCompile Include="..\..\src\cpp\client\client_unary_call.cc"> - </ClCompile> <ClCompile Include="..\..\src\cpp\client\create_channel.cc"> </ClCompile> <ClCompile Include="..\..\src\cpp\client\credentials.cc"> diff --git a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters index 37fc3d0eec..ae348d3fb5 100644 --- a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters +++ b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters @@ -13,9 +13,6 @@ <ClCompile Include="..\..\src\cpp\client\client_context.cc"> <Filter>src\cpp\client</Filter> </ClCompile> - <ClCompile Include="..\..\src\cpp\client\client_unary_call.cc"> - <Filter>src\cpp\client</Filter> - </ClCompile> <ClCompile Include="..\..\src\cpp\client\create_channel.cc"> <Filter>src\cpp\client</Filter> </ClCompile> @@ -108,6 +105,9 @@ <ClInclude Include="..\..\include\grpc++\config.h"> <Filter>include\grpc++</Filter> </ClInclude> + <ClInclude Include="..\..\include\grpc++\config_protobuf.h"> + <Filter>include\grpc++</Filter> + </ClInclude> <ClInclude Include="..\..\include\grpc++\create_channel.h"> <Filter>include\grpc++</Filter> </ClInclude> @@ -129,12 +129,18 @@ <ClInclude Include="..\..\include\grpc++\impl\internal_stub.h"> <Filter>include\grpc++\impl</Filter> </ClInclude> + <ClInclude Include="..\..\include\grpc++\impl\proto_utils.h"> + <Filter>include\grpc++\impl</Filter> + </ClInclude> <ClInclude Include="..\..\include\grpc++\impl\rpc_method.h"> <Filter>include\grpc++\impl</Filter> </ClInclude> <ClInclude Include="..\..\include\grpc++\impl\rpc_service_method.h"> <Filter>include\grpc++\impl</Filter> </ClInclude> + <ClInclude Include="..\..\include\grpc++\impl\serialization_traits.h"> + <Filter>include\grpc++\impl</Filter> + </ClInclude> <ClInclude Include="..\..\include\grpc++\impl\service_type.h"> <Filter>include\grpc++\impl</Filter> </ClInclude> @@ -197,9 +203,6 @@ <ClInclude Include="..\..\src\cpp\common\create_auth_context.h"> <Filter>src\cpp\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\cpp\proto\proto_utils.h"> - <Filter>src\cpp\proto</Filter> - </ClInclude> <ClInclude Include="..\..\src\cpp\server\thread_pool.h"> <Filter>src\cpp\server</Filter> </ClInclude> |