diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-10-28 17:34:55 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-10-28 17:34:55 -0700 |
| commit | 1e088b4219ac2c4e6ef60457bbf0e6db1f09cbd2 (patch) | |
| tree | accc29ff1bdcabb236d70a0cdcf04806a97410d0 /vsprojects/vcxproj/grpc++ | |
| parent | 846a18ad6b47c73ac6283f2538b23b9179e327fb (diff) | |
| parent | 393526334c45816c7aa1dc87b1a61f72e5a752c5 (diff) | |
Merge branch 'master' into rpc_mgr
Diffstat (limited to 'vsprojects/vcxproj/grpc++')
| -rw-r--r-- | vsprojects/vcxproj/grpc++/grpc++.vcxproj | 3 | ||||
| -rw-r--r-- | vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj index ad217dae7e..bf9c3a5c9d 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj @@ -285,6 +285,7 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_cxx11.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_no_cxx11.h" /> + <ClInclude Include="$(SolutionDir)\..\include\grpc++\resource_quota.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_context.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_metadata_processor.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\credentials.h" /> @@ -404,6 +405,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\cpp\common\resource_quota_cc.cc"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\server\async_generic_service.cc"> diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters index d4ad8c4c97..b88a78ad92 100644 --- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters @@ -58,6 +58,9 @@ <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc"> <Filter>src\cpp\common</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\cpp\common\resource_quota_cc.cc"> + <Filter>src\cpp\common</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\cpp\common\rpc_method.cc"> <Filter>src\cpp\common</Filter> </ClCompile> @@ -189,6 +192,9 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\thd_no_cxx11.h"> <Filter>include\grpc++\impl</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\include\grpc++\resource_quota.h"> + <Filter>include\grpc++</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\include\grpc++\security\auth_context.h"> <Filter>include\grpc++\security</Filter> </ClInclude> |