diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-18 13:24:15 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-18 13:24:15 -0700 |
| commit | 52c6142a30fc74d665bf6d7270c0d6835a9db38f (patch) | |
| tree | 79dfb91737924ece5106c8b9d43478d841d45048 /vsprojects | |
| parent | 6174b9a4d092c145d6cd3c90ab59bf5a0939329e (diff) | |
| parent | a15f08cc9a8004785ec937b2ee06951b600d87b6 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj.filters | 6 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 2 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/vsprojects/grpc/grpc.vcxproj b/vsprojects/grpc/grpc.vcxproj index 10be8f5992..37ebfed6ed 100644 --- a/vsprojects/grpc/grpc.vcxproj +++ b/vsprojects/grpc/grpc.vcxproj @@ -173,12 +173,14 @@ <ClInclude Include="..\..\src\core\tsi\transport_security.h" /> <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" /> <ClInclude Include="..\..\src\core\census\grpc_context.h" /> + <ClInclude Include="..\..\src\core\channel\census_filter.h" /> <ClInclude Include="..\..\src\core\channel\channel_args.h" /> <ClInclude Include="..\..\src\core\channel\channel_stack.h" /> <ClInclude Include="..\..\src\core\channel\child_channel.h" /> <ClInclude Include="..\..\src\core\channel\client_channel.h" /> <ClInclude Include="..\..\src\core\channel\client_setup.h" /> <ClInclude Include="..\..\src\core\channel\connected_channel.h" /> + <ClInclude Include="..\..\src\core\channel\context.h" /> <ClInclude Include="..\..\src\core\channel\http_client_filter.h" /> <ClInclude Include="..\..\src\core\channel\http_server_filter.h" /> <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> diff --git a/vsprojects/grpc/grpc.vcxproj.filters b/vsprojects/grpc/grpc.vcxproj.filters index 4af61e51eb..789febbaf8 100644 --- a/vsprojects/grpc/grpc.vcxproj.filters +++ b/vsprojects/grpc/grpc.vcxproj.filters @@ -431,6 +431,9 @@ <ClInclude Include="..\..\src\core\census\grpc_context.h"> <Filter>src\core\census</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\channel\census_filter.h"> + <Filter>src\core\channel</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\channel\channel_args.h"> <Filter>src\core\channel</Filter> </ClInclude> @@ -449,6 +452,9 @@ <ClInclude Include="..\..\src\core\channel\connected_channel.h"> <Filter>src\core\channel</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\channel\context.h"> + <Filter>src\core\channel</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\channel\http_client_filter.h"> <Filter>src\core\channel</Filter> </ClInclude> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index bd8ae4670a..d73ce72542 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -155,12 +155,14 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\src\core\census\grpc_context.h" /> + <ClInclude Include="..\..\src\core\channel\census_filter.h" /> <ClInclude Include="..\..\src\core\channel\channel_args.h" /> <ClInclude Include="..\..\src\core\channel\channel_stack.h" /> <ClInclude Include="..\..\src\core\channel\child_channel.h" /> <ClInclude Include="..\..\src\core\channel\client_channel.h" /> <ClInclude Include="..\..\src\core\channel\client_setup.h" /> <ClInclude Include="..\..\src\core\channel\connected_channel.h" /> + <ClInclude Include="..\..\src\core\channel\context.h" /> <ClInclude Include="..\..\src\core\channel\http_client_filter.h" /> <ClInclude Include="..\..\src\core\channel\http_server_filter.h" /> <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index dde460c83f..ee283cb9ff 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -314,6 +314,9 @@ <ClInclude Include="..\..\src\core\census\grpc_context.h"> <Filter>src\core\census</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\channel\census_filter.h"> + <Filter>src\core\channel</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\channel\channel_args.h"> <Filter>src\core\channel</Filter> </ClInclude> @@ -332,6 +335,9 @@ <ClInclude Include="..\..\src\core\channel\connected_channel.h"> <Filter>src\core\channel</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\channel\context.h"> + <Filter>src\core\channel</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\channel\http_client_filter.h"> <Filter>src\core\channel</Filter> </ClInclude> |