Skip to content

build: fix mac build with xcode 12#16514

Merged
alyssawilk merged 1 commit into
envoyproxy:mainfrom
ramaraochavali:fix/mac_build
May 18, 2021
Merged

build: fix mac build with xcode 12#16514
alyssawilk merged 1 commit into
envoyproxy:mainfrom
ramaraochavali:fix/mac_build

Conversation

@ramaraochavali
Copy link
Copy Markdown
Contributor

I have upgraded to xcode 12 and build is failing. This PR fixes it.

Commit Message: fix mac build with xcode 12
Additional Description:
Risk Level: N/A
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]
[Optional API Considerations:]

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
@ramaraochavali
Copy link
Copy Markdown
Contributor Author

@antoniovicente @alyssawilk @lizan can you PTAL?

@alyssawilk alyssawilk merged commit 1c7e3bf into envoyproxy:main May 18, 2021
prev_bytes_to_drain_ > 0
? prev_bytes_to_drain_
: std::min(buffer.length(), actual_frame_size_to_use_ - frame_overhead_size_);
: std::min<size_t>(buffer.length(), actual_frame_size_to_use_ - frame_overhead_size_);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @yihuazhang

I think this should have been std::min<uint64_t>. We'll revisit in #16488

Thanks for the build fix.

ntgsx92 pushed a commit to ntgsx92/envoy that referenced this pull request May 18, 2021
Commit Message: fix mac build with xcode 12

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Signed-off-by: Sixiang Gu <sgu@twitter.com>
@ramaraochavali ramaraochavali deleted the fix/mac_build branch May 19, 2021 03:52
leyao-daily pushed a commit to leyao-daily/envoy that referenced this pull request Sep 30, 2021
Commit Message: fix mac build with xcode 12

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants