diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-23 11:28:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-23 11:28:16 -0700 |
| commit | b256faa353159c0b6f3477777bed75b4f9de3e16 (patch) | |
| tree | 75c07077be01aa0120dc7b00dc5bdf88c51c87f6 /vsprojects/grpc_unsecure | |
| parent | b358c41c7e901e170de7621c682b845469f4f667 (diff) | |
| parent | 5126bb6d8261ef07fb8132d5b5937f149cf315c8 (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'vsprojects/grpc_unsecure')
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 7 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index 5c1e574db7..7b3f8aa480 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -173,7 +173,7 @@ <ClInclude Include="..\..\src\core\client_config\resolver_factory.h" /> <ClInclude Include="..\..\src\core\client_config\resolver_registry.h" /> <ClInclude Include="..\..\src\core\client_config\resolvers\dns_resolver.h" /> - <ClInclude Include="..\..\src\core\client_config\resolvers\unix_resolver_posix.h" /> + <ClInclude Include="..\..\src\core\client_config\resolvers\sockaddr_resolver.h" /> <ClInclude Include="..\..\src\core\client_config\subchannel.h" /> <ClInclude Include="..\..\src\core\client_config\subchannel_factory.h" /> <ClInclude Include="..\..\src\core\client_config\uri_parser.h" /> @@ -251,6 +251,7 @@ <ClInclude Include="..\..\src\core\transport\transport.h" /> <ClInclude Include="..\..\src\core\transport\transport_impl.h" /> <ClInclude Include="..\..\src\core\census\context.h" /> + <ClInclude Include="..\..\src\core\census\rpc_stat_id.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\core\surface\init_unsecure.c"> @@ -289,7 +290,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\client_config\resolvers\dns_resolver.c"> </ClCompile> - <ClCompile Include="..\..\src\core\client_config\resolvers\unix_resolver_posix.c"> + <ClCompile Include="..\..\src\core\client_config\resolvers\sockaddr_resolver.c"> </ClCompile> <ClCompile Include="..\..\src\core\client_config\subchannel.c"> </ClCompile> @@ -479,6 +480,8 @@ </ClCompile> <ClCompile Include="..\..\src\core\census\initialize.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\record_stat.c"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\gpr\gpr.vcxproj"> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index 7b37602891..bd197b9c48 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -55,7 +55,7 @@ <ClCompile Include="..\..\src\core\client_config\resolvers\dns_resolver.c"> <Filter>src\core\client_config\resolvers</Filter> </ClCompile> - <ClCompile Include="..\..\src\core\client_config\resolvers\unix_resolver_posix.c"> + <ClCompile Include="..\..\src\core\client_config\resolvers\sockaddr_resolver.c"> <Filter>src\core\client_config\resolvers</Filter> </ClCompile> <ClCompile Include="..\..\src\core\client_config\subchannel.c"> @@ -340,6 +340,9 @@ <ClCompile Include="..\..\src\core\census\initialize.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\census\record_stat.c"> + <Filter>src\core\census</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\grpc\byte_buffer.h"> @@ -419,7 +422,7 @@ <ClInclude Include="..\..\src\core\client_config\resolvers\dns_resolver.h"> <Filter>src\core\client_config\resolvers</Filter> </ClInclude> - <ClInclude Include="..\..\src\core\client_config\resolvers\unix_resolver_posix.h"> + <ClInclude Include="..\..\src\core\client_config\resolvers\sockaddr_resolver.h"> <Filter>src\core\client_config\resolvers</Filter> </ClInclude> <ClInclude Include="..\..\src\core\client_config\subchannel.h"> @@ -653,6 +656,9 @@ <ClInclude Include="..\..\src\core\census\context.h"> <Filter>src\core\census</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\census\rpc_stat_id.h"> + <Filter>src\core\census</Filter> + </ClInclude> </ItemGroup> <ItemGroup> |