Protocol Buffers

~thopiekar/protobuf/+git/protobuf:23.x-202305081751

  1. Git
  2. lp:~thopiekar/protobuf/+git/protobuf
  3. 23.x-202305081751
Last commit made on 2023-05-08
Get this branch:
git clone -b 23.x-202305081751 https://git.launchpad.net/~thopiekar/protobuf/+git/protobuf

Branch merges

Branch information

Name:
23.x-202305081751
Repository:
lp:~thopiekar/protobuf/+git/protobuf

Recent commits

2e98354... by Protobuf Team Bot <email address hidden>

Updating version.json to: 23.1-dev

6e51167... by Protobuf Team Bot <email address hidden>

Updating version.json and repo version numbers to: 23.0

abb293d... by Matt

Merge pull request #12702 from fowles/23.x

Cherry pick various portability fixes from mainline

b880933... by Carlos O'Ryan <email address hidden>

fix: avoid warnings on MSVC (#12697)

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=https://github.com/protocolbuffers/protobuf/pull/12697 from coryan:fix-msvc-warnings-in-arena-align 835f3b489a85e1b50281ac2943bd74d159eb3ead
PiperOrigin-RevId: 530137165

fe1277f... by Carlos O'Ryan <email address hidden>

fix: avoid warnings on Windows (#12701)

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=https://github.com/protocolbuffers/protobuf/pull/12701 from coryan:fix-warnings-repeated-field-warnings-in-msvc b1ec34de77cbd31c914b810c87cbe16f1ce51a7d
PiperOrigin-RevId: 530134611

28c9905... by Carlos O'Ryan <email address hidden>

fix: typo in `string(JOIN)` workaround (#12698)

My sketch to fix #12672 was wrong. This works for realsies.

Closes #12698

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12698 from coryan:fix-cmake-typo-in-string-join-workaround 182d2e248ee10403541c5ddd07857846a66ae57d
PiperOrigin-RevId: 530116824

1ca4e9c... by Carlos O'Ryan <email address hidden>

fix: missing -DPROTOBUF_USE_DLLS in pkg-config (#12700)

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=https://github.com/protocolbuffers/protobuf/pull/12700 from coryan:fix-define-protobuf-use-dlls-in-pkg-config-file 13c792eebd3d070fa25eff68cfca6ae1493e9503
PiperOrigin-RevId: 530116678

d5a1b09... by Mike Kruskal <email address hidden>

Merge pull request #12695 from protocolbuffers/cpp-fixes-23

Backport increased C++ test coverage + fixes

bc9a1d2... by Mike Kruskal <email address hidden>

Add tests for GCC support window.

Note: gcc only supports docker images down to 9.5, and the 7.3 image is very old and problematic. A follow-up change might enable testing for GCC 7.3, which is our minimal supported version
PiperOrigin-RevId: 529885733

54caf40... by Mike Kruskal <email address hidden>

Avoid using string(JOIN..., which requires cmake 3.12

This also downgrades our tests to use cmake 3.10, compatible with our support window.

Closes #12672

PiperOrigin-RevId: 529840763