Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate from Piper for C++, Java, and Python #8076

Merged
merged 8 commits into from
Nov 23, 2020
Merged

Integrate from Piper for C++, Java, and Python #8076

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c028d6
Sync from Piper @343521567
haberman Nov 20, 2020
920803e
Merge tag 'refs/tags/sync-piper' into sync-stage
haberman Nov 20, 2020
1817a01
Updated changelog.
haberman Nov 20, 2020
29e788d
Fixed spelling mistake.
haberman Nov 20, 2020
9be0420
Reverted unintentional change.
haberman Nov 20, 2020
284f4b6
Fixed another spelling error.
haberman Nov 20, 2020
c2c13a5
Fixed Python C++ extension for Python 3.8.
haberman Nov 20, 2020
7993c74
Added note to CHANGES.txt about Arena::SpaceAllocated().
haberman Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/google/protobuf/arena.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
}
}

// The following are routines are for monitoring. They will aproximate the
Copy link

Choose a reason for hiding this comment

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

CHANGES.txt

Copy link
Member Author

Choose a reason for hiding this comment

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

Are you suggesting that something needs to be added to CHANGES.txt here?

// The following are routines are for monitoring. They will approximate the
// total sum allocated and used memory, but the exact value is an
// implementation deal. For instance allocated space depends on growth
// policies. Do not use these in unit tests.
Expand Down