Cherry pick various portability fixes from mainline#12703
Merged
fowles merged 4 commits intoprotocolbuffers:22.xfrom May 8, 2023
fowles:22.x
Merged
Cherry pick various portability fixes from mainline#12703fowles merged 4 commits intoprotocolbuffers:22.xfrom fowles:22.x
fowles merged 4 commits intoprotocolbuffers:22.xfrom
fowles:22.x
Conversation
When the protobuf libraries have been compiled as shared libraries the users of the library need to add `-DPROTOBUF_USE_DLLS` to their build line. Otherwise some symbols are missing. Fixes #12699 FWIW, I am not sure this is an ideal fix. It may be better to fix the headers such that no macros change the ABI. Closes #12700 COPYBARA_INTEGRATE_REVIEW=#12700 from coryan:fix-define-protobuf-use-dlls-in-pkg-config-file 13c792e PiperOrigin-RevId: 530116678
On Wndows, `size_t` is 64-bits, and `int` is 32-bits. That makes conversions from `size_t` to `int` potentially lossy, and they generate warnings. In this case an `int` variable was assigned to `size_t` and then passed to functions consuming `int`. Seems simpler to use `auto` and avoid these problems altogether. Closes #12701 COPYBARA_INTEGRATE_REVIEW=#12701 from coryan:fix-warnings-repeated-field-warnings-in-msvc b1ec34d PiperOrigin-RevId: 530134611
Warnings in header files can be a problem for consumers that enable `/WX` (or `-Werror`). In this case, using `... & -align` produces a warning (C4146) with MSVC. The fix is to use equivalent expression `... & ~(align - 1)`, which was already used in the same file. Fixes #12675 Closes #12697 COPYBARA_INTEGRATE_REVIEW=#12697 from coryan:fix-msvc-warnings-in-arena-align 835f3b4 PiperOrigin-RevId: 530137165
fowles
added
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
mkruskal-google
approved these changes
May 8, 2023
mkruskal-google
added
the
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.