diff options
author | Alistair Veitch <aveitch@google.com> | 2016-02-02 09:43:02 -0800 |
---|---|---|
committer | Alistair Veitch <aveitch@google.com> | 2016-02-02 09:43:02 -0800 |
commit | 75d5c0f024438944425cf1bd3163b07c6f6e55b5 (patch) | |
tree | 8130c65c6e654bc42187342cb3d8004379422dfa /vsprojects/vcxproj/grpc_unsecure | |
parent | 7c43f4909242b62881389c7d4cfc9541c70151b6 (diff) |
post merge
Diffstat (limited to 'vsprojects/vcxproj/grpc_unsecure')
-rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj | 5 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 014e67f461..8a6f66da58 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -380,7 +380,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\transport\transport_impl.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h" /> - <ClInclude Include="$(SolutionDir)\..\src\core\census\context.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h" /> </ItemGroup> <ItemGroup> @@ -542,6 +541,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\byte_buffer.c"> @@ -644,7 +645,7 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\tag_set.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\placeholders.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> </ClCompile> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 4f8a77d4b2..2253db6c55 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -238,6 +238,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -391,7 +394,7 @@ <ClCompile Include="$(SolutionDir)\..\src\core\census\operation.c"> <Filter>src\core\census</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\census\tag_set.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\census\placeholders.c"> <Filter>src\core\census</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\census\tracing.c"> @@ -761,9 +764,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\census\aggregation.h"> <Filter>src\core\census</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\census\context.h"> - <Filter>src\core\census</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\census\rpc_metric_id.h"> <Filter>src\core\census</Filter> </ClInclude> |