diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-10-24 15:54:09 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-24 15:54:09 -0700 |
| commit | 1bda5106421c5e6f449e6dbdd2214cdf31b26fcf (patch) | |
| tree | 94b9b8bd4a92e07884c1471f17a1d876732416e6 | |
| parent | 7e08c1a60650c9bf62af26e2850528085cb7faa3 (diff) | |
| parent | 44d820ee2c6d7498cff42910bda5eaafc9411f14 (diff) | |
Merge pull request #13094 from muxi/fix-objc-cpp-build
Fix objc build problem with C++ core
| -rw-r--r-- | gRPC-Core.podspec | 3 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/flow_control.cc | 2 | ||||
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a9b451e3de..0e3b50c4aa 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -89,6 +89,7 @@ Pod::Spec.new do |s| s.default_subspecs = 'Interface', 'Implementation' s.compiler_flags = '-DGRPC_ARES=0' + s.libraries = 'c++' # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its # sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't @@ -1007,7 +1008,7 @@ Pod::Spec.new do |s| 'test/core/end2end/tests/*.{c,h}', 'test/core/end2end/fixtures/*.h', 'test/core/end2end/data/*.{c,h}', - 'test/core/util/debugger_macros.{c,h}', + 'test/core/util/debugger_macros.{cc,h}', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', 'test/core/util/port.c', diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index dd80036530..40545bc74b 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -165,7 +165,7 @@ TransportFlowControl::TransportFlowControl(grpc_exec_ctx* exec_ctx, uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { FlowControlTrace trace("t updt sent", this, nullptr); - const uint32_t target_announced_window = target_window(); + const uint32_t target_announced_window = (const uint32_t)target_window(); if ((writing_anyway || announced_window_ <= target_announced_window / 2) && announced_window_ != target_announced_window) { const uint32_t announce = (uint32_t)GPR_CLAMP( diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 5657df8521..c329d2dedc 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -116,6 +116,7 @@ s.default_subspecs = 'Interface', 'Implementation' s.compiler_flags = '-DGRPC_ARES=0' + s.libraries = 'c++' # Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its # sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't @@ -174,7 +175,7 @@ 'test/core/end2end/tests/*.{c,h}', 'test/core/end2end/fixtures/*.h', 'test/core/end2end/data/*.{c,h}', - 'test/core/util/debugger_macros.{c,h}', + 'test/core/util/debugger_macros.{cc,h}', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', 'test/core/util/port.c', |