diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-01 20:31:27 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-01 20:31:27 -0700 |
| commit | 14556ecf8c59c7eb112c79e86e5c7bc0911f4478 (patch) | |
| tree | 0ff7ca7402fbd8a20b5116b6d159539cc379d450 /vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | |
| parent | 8e0b08a33d819d0a2523ec439d545296e1ad2086 (diff) | |
| parent | 3d67c7cf45f694a793be1adacafa2cfb98ecd75f (diff) | |
Merge branch 'count-the-things' into we-dont-need-no-backup
Conflicts:
Makefile
src/core/iomgr/pollset_posix.c
src/core/surface/call.c
src/core/surface/channel.c
src/core/surface/server.c
src/python/src/grpc/_adapter/_low_test.py
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'vsprojects/grpc_unsecure/grpc_unsecure.vcxproj')
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index b7860bd6b2..bd525ec768 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -150,9 +150,10 @@ <ClInclude Include="..\..\include\grpc\byte_buffer_reader.h" /> <ClInclude Include="..\..\include\grpc\grpc.h" /> <ClInclude Include="..\..\include\grpc\status.h" /> + <ClInclude Include="..\..\include\grpc\census.h" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\core\channel\census_filter.h" /> + <ClInclude Include="..\..\src\core\census\grpc_context.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" /> @@ -201,12 +202,6 @@ <ClInclude Include="..\..\src\core\json\json_writer.h" /> <ClInclude Include="..\..\src\core\profiling\timers.h" /> <ClInclude Include="..\..\src\core\profiling\timers_preciseclock.h" /> - <ClInclude Include="..\..\src\core\statistics\census_interface.h" /> - <ClInclude Include="..\..\src\core\statistics\census_log.h" /> - <ClInclude Include="..\..\src\core\statistics\census_rpc_stats.h" /> - <ClInclude Include="..\..\src\core\statistics\census_tracing.h" /> - <ClInclude Include="..\..\src\core\statistics\hash_table.h" /> - <ClInclude Include="..\..\src\core\statistics\window_stats.h" /> <ClInclude Include="..\..\src\core\surface\byte_buffer_queue.h" /> <ClInclude Include="..\..\src\core\surface\call.h" /> <ClInclude Include="..\..\src\core\surface\channel.h" /> @@ -239,11 +234,12 @@ <ClInclude Include="..\..\src\core\transport\stream_op.h" /> <ClInclude Include="..\..\src\core\transport\transport.h" /> <ClInclude Include="..\..\src\core\transport\transport_impl.h" /> + <ClInclude Include="..\..\src\core\census\context.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\core\surface\init_unsecure.c"> </ClCompile> - <ClCompile Include="..\..\src\core\channel\census_filter.c"> + <ClCompile Include="..\..\src\core\census\grpc_context.c"> </ClCompile> <ClCompile Include="..\..\src\core\channel\channel_args.c"> </ClCompile> @@ -351,18 +347,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\profiling\stap_timers.c"> </ClCompile> - <ClCompile Include="..\..\src\core\statistics\census_init.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\statistics\census_log.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\statistics\census_rpc_stats.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\statistics\census_tracing.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\statistics\hash_table.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\statistics\window_stats.c"> - </ClCompile> <ClCompile Include="..\..\src\core\surface\byte_buffer.c"> </ClCompile> <ClCompile Include="..\..\src\core\surface\byte_buffer_queue.c"> @@ -441,6 +425,10 @@ </ClCompile> <ClCompile Include="..\..\src\core\transport\transport_op_string.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\context.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\census\initialize.c"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\gpr\gpr.vcxproj"> |