diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-01 08:29:56 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-01 08:29:56 -0700 |
| commit | 89119fa9b63882090ce925a98eeb6e4b5cb1757e (patch) | |
| tree | 957b6d7522f6d88fbd92bf5392ab19a922a77915 /vsprojects/vcxproj/grpc_unsecure | |
| parent | 1bbe6cb143e98805a5f9dc2745a45bff85bd768c (diff) | |
| parent | 2a5959f2aeca2e86cc752288d890bc10b24c55d0 (diff) | |
Merge branch 'client_channel_cleanup' into deadline_filter
Diffstat (limited to 'vsprojects/vcxproj/grpc_unsecure')
| -rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 9 | ||||
| -rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 96b6569e3e..2a636fe5db 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -393,7 +393,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\initial_connect_string.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\lb_policy.h" /> @@ -403,8 +402,8 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\ext\load_reporting\load_reporting.h" /> @@ -669,8 +668,6 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c"> @@ -693,9 +690,9 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> </ClCompile> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 0e2c27779b..739ef1684f 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -364,9 +364,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> - <Filter>src\core\ext\client_config</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> @@ -400,10 +397,10 @@ <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> @@ -890,9 +887,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h"> - <Filter>src\core\ext\client_config</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> @@ -920,10 +914,10 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h"> |