Commit Graph

8079 Commits

Author SHA1 Message Date
Adam Cozzette
6099c6505d
Updated CHANGES.txt for 3.16.0 (#8456)
* Updated CHANGES.txt for 3.16.0

* Fix spelling errors
2021-04-06 13:23:26 -07:00
Adam Cozzette
c9343864a2
Merge pull request #8447 from acozzette/merge-3-15-x
Merge 3.15.x into the master branch
2021-04-02 15:51:34 -07:00
Adam Cozzette
600799912a Revert "[C++] Refactor uint128 (#8416)"
This reverts commit b604419d26.
2021-04-02 15:49:06 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Derek Perez
97cb3a862f
Merge pull request #8444 from perezd/sync-stage
Integrate from Piper for C++, Java, and Python
2021-04-02 11:22:40 -07:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Adam Cozzette
c00c2d43bb Updated CHANGES.txt and package.xml with changes for 3.15.7 2021-04-02 11:06:56 -07:00
Derek Perez
361308c4f2 fix wrapping of line in CHANGES.txt 2021-04-01 21:15:38 +00:00
Derek Perez
9147109854 editing CHANGES.txt 2021-04-01 20:49:42 +00:00
David L. Jones
f82e268ed7 Remove references to stale benchmark data sources. 2021-04-01 12:21:02 -07:00
David L. Jones
240e54efe5 Remove references to stale benchmark data sources. 2021-04-01 12:19:10 -07:00
Joshua Haberman
f3f8707ba5
Merge pull request #8434 from haberman/ruby-message-eq
Fixed message equality in cases where the message type is different.
2021-04-01 12:16:53 -07:00
Derek Perez
49ed194e88 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-01 18:49:53 +00:00
Derek Perez
4008d229aa Sync from Piper @366297034
PROTOBUF_SYNC_PIPER
2021-04-01 18:49:52 +00:00
Joshua Haberman
38e1b59258 Elided the TYPE() and msgdef checks by using CLASS_OF. 2021-04-01 10:22:35 -07:00
deannagarcia
c3f4b108b3
Changing codespell and mergeable ymls to prepare for opensourcing kotlin protos (#8442) 2021-04-01 09:46:58 -07:00
cfredri4
c47ebfd82b
Fix maven URL (#8440) 2021-03-31 13:47:47 -07:00
aaron ai
62c402ae37
Add 'java/lite/target' to .gitignore (#8439) 2021-03-31 11:03:01 -07:00
Joshua Haberman
e9360dfa53
Merge pull request #8437 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-03-30 13:41:33 -07:00
Joshua Haberman
7224406161 Updated CHANGES.txt for sync. 2021-03-30 12:38:52 -07:00
Joshua Haberman
c0c6cad184 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/stubs/statusor.h
2021-03-30 12:37:32 -07:00
Joshua Haberman
4a6dc34d3a Sync from Piper @365872496
PROTOBUF_SYNC_PIPER
2021-03-30 12:37:31 -07:00
Yannic
b604419d26
[C++] Refactor uint128 (#8416)
* [C++] Refactor uint128

This makes it compatible with absl::uint128

* Remove use of absl

* Add header to test

* Exclude typetraits tests from gcc < 5
2021-03-30 11:28:50 -07:00
Jan Tattermusch
0ebbd7d7c3
Enable crosscompiling aarch64 python wheels under dockcross manylinux docker image (#8280)
This uses the dockcross manylinux docker image to enable crosscompiling aarch64 python wheels. The wheels built for aarch64 linux are excluded from the release for now, pending testing (pending, in PR#8392).
2021-03-29 19:04:16 -07:00
Joshua Haberman
d69f482883 Fixed message equality in cases where the message type is different.
If the message types are different, equality comparison must return
false.
2021-03-29 17:37:36 -07:00
Joshua Haberman
a38319b5c4
Merge pull request #8429 from haberman/ruby-gc-secondarymap
Fix unbounded memory growth for Ruby <2.7.
2021-03-29 13:31:28 -07:00
Joshua Haberman
2fe27d8764 Addressed PR comments and fixed a bug.
We now hold the mutex for both map insertions, to protect
against a concurrent GC that removes from the seconary map
before we can insert into the weak map.
2021-03-29 12:30:49 -07:00
Joshua Haberman
e1ac393725 Added some more comments and refactored slightly. 2021-03-25 11:54:50 -07:00
Joshua Haberman
f0d6fcb2da Wrap secondary map mutations in a mutex, to avoid mutation races. 2021-03-25 11:54:50 -07:00
Joshua Haberman
b75a49f9e0 GC secondary map periodically. 2021-03-25 11:54:50 -07:00
Esun Kim
aedb8d726c
Added UnsafeByteOperations to protobuf-lite (#8426) 2021-03-24 13:13:26 -07:00
David L. Jones
25968de87a
Remove the ::pb namespace (alias). (#8423)
This closes #8349, although we will probably still pursue some other name in the future.
2021-03-23 19:58:29 -07:00
Yannic
4b770cabd7
[C++] Refactor StatusOr and StringPiece (#8406)
* [C++] Refactor StatusOr and StringPiece

This change makes `StatusOr` and `StringPiece` more like
`absl::StatusOr` and `{absl,std}::string_view`.

Note that there is more work required before the Abseil types can be
used as drop-in replacement.

Progress on #3688

* Fix more errors

* Fix test

* Remove some asserts

* Delete outdate example
2021-03-23 11:54:09 -07:00
Joshua Haberman
5941bd1198
Merge pull request #8422 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-03-22 18:05:16 -07:00
Joshua Haberman
9daba367f4 Updated changelog. 2021-03-22 16:29:46 -07:00
Joshua Haberman
96307d28f6 Sync from Piper @364389596
PROTOBUF_SYNC_PIPER
2021-03-22 13:05:55 -07:00
Joshua Haberman
77334e39a7 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-03-22 13:05:55 -07:00
Adam Cozzette
617e255617
Merge pull request #8409 from srago/protoc-fix
add error returns missing from protoc to prevent it from exiting with…
2021-03-18 14:11:58 -07:00
Adam Cozzette
f57940391c
Merge pull request #8408 from PatriosTheGreat/master
Fix -Wsuggest-destructor-override for generated C++ proto classes.
2021-03-18 08:46:19 -07:00
Levon Ter-Grigoryan
53b0cce27b Fix -Wsuggest-destructor-override for generated C++ proto classes. 2021-03-17 20:17:06 +01:00
Steve Rago
57e09ad848 add error returns missing from protoc to prevent it from exiting with a successful return value when writing the zip file fails 2021-03-17 10:31:03 -04:00
Adam Cozzette
4c5465e5fe
Merge pull request #8402 from acozzette/merge-3-15-x
Merge 3.15.x into master branch
2021-03-16 11:01:34 -07:00
Adam Cozzette
f9c7b5a284
Merge pull request #8407 from reznikmm/patch-1
Add protobuf for Ada
2021-03-16 10:14:17 -07:00
Maxim Reznik
b4cddb71d6
Add protobuf for Ada 2021-03-16 18:44:23 +02:00
Adam Cozzette
3a127ae4fb
Merge pull request #7744 from Yannic/bazel_bench
[bazel] Add BUILD files for benchmark protos
2021-03-16 09:28:06 -07:00
Adam Cozzette
146d579738
Merge pull request #8405 from Yannic/status-del-error
Make util::Status more similar to absl::Status
2021-03-15 13:37:06 -07:00
Adam Cozzette
4f8fef0a86
Merge pull request #8319 from elharo/patch-4
deps: update JUnit and Truth
2021-03-15 13:13:28 -07:00
Adam Cozzette
ee35b2da4b
Merge pull request #8374 from igor-sirotin/feature/cmake-protoc-options
[CMake] Abilty to pass options to protoc executable from cmake
2021-03-15 12:51:13 -07:00
Adam Cozzette
28dbe3b09b
Merge pull request #8285 from s1341/master
Fix missing -llog when compiling for android
2021-03-15 11:34:59 -07:00
Yannic Bonenberger
3a7bd9c236 Make util::Status more similar to absl::Status
Progress on #3688
2021-03-14 13:47:33 +01:00