From ae6bca4420cac3dddbe7794a8725f7b11c0d7bc8 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 19 Oct 2017 18:14:02 -0700 Subject: [PATCH] Make fix objc build problem --- gRPC-Core.podspec | 1 + src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +- templates/gRPC-Core.podspec.template | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a9b451e3dea..df9ec5a7c57 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//` and its # sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index dd80036530c..40545bc74b4 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 5657df85211..2836ab1f75b 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//` and its # sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't