diff options
author | Julien Boeuf <jboeuf@google.com> | 2015-08-30 22:01:33 -0700 |
---|---|---|
committer | Julien Boeuf <jboeuf@google.com> | 2015-08-30 22:01:33 -0700 |
commit | d1b6152f886e17ffb29e997fbd0ff647322fa379 (patch) | |
tree | e4441193305cc085baa92c1be08366d595613b66 /vsprojects | |
parent | fe1478f19e0bf8d7f26ecd3f3b02b25b2fbd86d0 (diff) | |
parent | 8c0d6b37a115fa20d2abded045cdabe29e87f59e (diff) |
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'vsprojects')
-rw-r--r-- | vsprojects/grpc/grpc.vcxproj | 4 | ||||
-rw-r--r-- | vsprojects/grpc/grpc.vcxproj.filters | 6 | ||||
-rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 4 | ||||
-rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 6 |
4 files changed, 20 insertions, 0 deletions
diff --git a/vsprojects/grpc/grpc.vcxproj b/vsprojects/grpc/grpc.vcxproj index 1fa7e4b4f1..f85216151b 100644 --- a/vsprojects/grpc/grpc.vcxproj +++ b/vsprojects/grpc/grpc.vcxproj @@ -625,8 +625,12 @@ </ClCompile> <ClCompile Include="..\..\src\core\census\initialize.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\operation.c"> + </ClCompile> <ClCompile Include="..\..\src\core\census\record_stat.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\tracing.c"> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\gpr\gpr.vcxproj"> diff --git a/vsprojects/grpc/grpc.vcxproj.filters b/vsprojects/grpc/grpc.vcxproj.filters index b22818aebd..835aa1b165 100644 --- a/vsprojects/grpc/grpc.vcxproj.filters +++ b/vsprojects/grpc/grpc.vcxproj.filters @@ -418,9 +418,15 @@ <ClCompile Include="..\..\src\core\census\initialize.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\census\operation.c"> + <Filter>src\core\census</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\census\record_stat.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\census\tracing.c"> + <Filter>src\core\census</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\grpc\grpc_security.h"> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index 3883a328e0..ca73b5633a 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -568,8 +568,12 @@ </ClCompile> <ClCompile Include="..\..\src\core\census\initialize.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\operation.c"> + </ClCompile> <ClCompile Include="..\..\src\core\census\record_stat.c"> </ClCompile> + <ClCompile Include="..\..\src\core\census\tracing.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 d12abc0ad7..994539cfa2 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -358,9 +358,15 @@ <ClCompile Include="..\..\src\core\census\initialize.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\census\operation.c"> + <Filter>src\core\census</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\census\record_stat.c"> <Filter>src\core\census</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\census\tracing.c"> + <Filter>src\core\census</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\include\grpc\byte_buffer.h"> |