Commit Graph

9584 Commits

Author SHA1 Message Date
Dennis Shao
e09804591d
Merge branch 'protocolbuffers:main' into master 2022-06-22 14:46:13 -05:00
Jonathan Ringer
046bde0017
Allow for CMAKE_INSTALL_CMAKEDIR to be absolute (#10090)
Package repositories such as NixOS will pass
an absolute paths to CMAKE.

- Also clarify installation of cmake configuration
files between the build and install directories.
2022-06-22 10:43:13 -07:00
Dennis Shao
1640336fcf
Create .repo-metadata.json 2022-06-21 18:07:57 -05:00
Dennis Shao
3f0f59b00e
Merge pull request #10160 from shaod2/master
Update options.md
2022-06-21 16:56:58 -05:00
Dennis Shao
a9d9c00bff
Update options.md
https://github.com/protocolbuffers/protobuf/issues/10153
2022-06-21 14:52:40 -05:00
deannagarcia
0933faa9ba
Merge pull request #10140 from protocolbuffers/updateDocuploaderVersion
Update versions for publish python script
2022-06-21 17:39:42 +00:00
Jorg Brown
cecbb0a70e
Merge pull request #10148 from jorgbrown/sync-stage
Integrate from Piper for C++, Java, and Python

* Modernize conformance_cpp.cc.
* Don't request 64-byte alignment unless the toolchain supports it.
2022-06-18 19:32:48 -07:00
Jorg Brown
feb726159f Remove * Take StringPiece instead of const string& in absl stubs. from CHANGES.txt since we're not taking it. 2022-06-18 19:27:22 -07:00
Jorg Brown
7bb756c1cc Re-instate commit c0fc2e881b 2022-06-18 19:22:47 -07:00
Jorg Brown
24d0a3bed1 Revert all changes to strutil.{h,cc} from this PR 2022-06-18 18:01:06 -07:00
Jorg Brown
a075d2fb14 Remove extraneous ';' 2022-06-18 15:27:10 -07:00
Jorg Brown
81491e034f Can't use char * for quoted literals. I knew that. 2022-06-18 15:16:40 -07:00
Jorg Brown
e9668e41be Find out who is calling StringReplace, or if the call is from strutil
itself.
2022-06-18 14:54:10 -07:00
Jorg Brown
dc7f4debbc More debugging information please 2022-06-17 21:11:17 -07:00
Jorg Brown
126841ed7d Add some extra tracing to figure out a crash during build 2022-06-17 19:34:14 -07:00
Jorg Brown
a94d41960e Add missing file names to BUILD.bazel files. 2022-06-17 17:19:14 -07:00
Jorg Brown
8deb95bda9 Fix typo and update CHANGES.txt 2022-06-17 13:59:28 -07:00
Jorg Brown
4eeaacd3fd Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/compiler/java/message_serialization.cc
2022-06-17 10:08:18 -07:00
Jorg Brown
a3e1de0113 Sync from Piper @455586341
PROTOBUF_SYNC_PIPER
2022-06-17 04:13:20 -07:00
Dilan Sachintha Nayanajith
92ac51fd43
Update options.md (#10137) 2022-06-16 08:59:10 -07:00
mkruskal-google
6e34912084
Removing deleted files from dist rule (#10141) 2022-06-15 17:00:35 -07:00
Dave MacLachlan
e04ca460fb Fix up missing include files for unordered_set/map 2022-06-15 14:36:19 -04:00
Deanna Garcia
87ac4650a3 Update versions for publish python script 2022-06-15 17:22:55 +00:00
Thomas Van Lenten
772c98984a Add package_as_prefix_forced_prefix generation option.
This is a generation option that provides serves the same purpose as the
existing GPB_OBJC_USE_PACKAGE_AS_PREFIX_PREFIX environment variable; just
providing a different way to set/enable it.
2022-06-15 09:52:57 -04:00
Jon Skeet
cacb096002 Add CodeRush directory to .gitignore for C#
This is just a temporary directory for CodeRush, and should never
contain anything worth checking in. (Like the .vs directory.)
2022-06-14 10:03:38 +01:00
Jon Skeet
837db77ecf Remove C# code specific to .NET 3.5
The codebase has changed a lot since it was last able to compile
with .NET 3.5, so we don't need this vestigial code.
2022-06-14 10:03:38 +01:00
Joshua Haberman
c38281dd20
Merge pull request #10102 from fiboknacky/update-fielddescriptor
Exposed more functions in FieldDescriptor and OneofDescriptor.
2022-06-12 20:49:34 -07:00
Elliotte Rusty Harold
a612a75b68
Merge pull request #10130 from elharo/sync-stage
Integrate from Piper for C++, Java, and Python
2022-06-11 11:17:50 +00:00
Elliotte Rusty Harold
b53e63bae1 update CHANGE list 2022-06-10 18:45:38 -04:00
Elliotte Rusty Harold
81fc22c8ab Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-10 18:37:12 -04:00
Elliotte Rusty Harold
5a9bf6c7de Sync from Piper @454255492
PROTOBUF_SYNC_PIPER
2022-06-10 18:37:11 -04:00
Elliotte Rusty Harold
9f53ec3996 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-10 16:04:55 -04:00
Elliotte Rusty Harold
24dad62f40 Sync from Piper @454225000
PROTOBUF_SYNC_PIPER
2022-06-10 16:04:55 -04:00
Elliotte Rusty Harold
70e2923365 update CHANGE list 2022-06-10 14:33:54 -04:00
Elliotte Rusty Harold
31ba940bfe Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-10 14:32:15 -04:00
Elliotte Rusty Harold
ce537e8a3e Sync from Piper @454206746
PROTOBUF_SYNC_PIPER
2022-06-10 14:32:14 -04:00
Marc Plano-Lesay
85225b83c3
Remove unused Offset function (#10120)
This fails to build with -Werror.
2022-06-09 16:59:07 -07:00
David Neto
af699898d2
Length check accommodates NUL emitted by sprintf (#10128)
Update the length check in google::protobuf::CEscapeInternal to account
for the extra NUL character emitted by snprintf when escaping hex and
octal sequences.

That function is an internal detail, not exported via any header.
Internally, it is used in two places, and both calls make buffers
that do have space for the extra NUL.
So in the actual usage, the check is redundant.
2022-06-09 16:30:53 -07:00
Chenwei Xiao
1bbf6f37cc
Correct file extention of README (#10125) 2022-06-09 15:52:50 -07:00
YJ
2bc5f95fe3
add missing quotes (#10123) 2022-06-09 13:27:39 -07:00
Dave MacLachlan
922f5024cb Clean up some warnings
Move to explicit on single arg c'tors.
Move to unordered container types when working with pointers as order is likely unnecessary and just a performance issue.
2022-06-09 08:19:06 -04:00
Elliotte Rusty Harold
2b19a8062a update CHANGE list 2022-06-09 07:45:29 -04:00
Elliotte Rusty Harold
f5ba6c8610 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-09 07:42:15 -04:00
Elliotte Rusty Harold
9e24b1912e Sync from Piper @453894829
PROTOBUF_SYNC_PIPER
2022-06-09 07:42:14 -04:00
Thanet (Knack) Praneenararat
0f1574aae2 Fixed bugs of OneofDescriptor. 2022-06-09 17:00:00 +09:00
Elliotte Rusty Harold
0a16bdfbe6
Ignore configure~ (#10117)
fixes #9974
@acozzette
2022-06-08 14:59:30 -04:00
Elliotte Rusty Harold
4d96482e72 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-06-08 12:49:35 -04:00
Elliotte Rusty Harold
3ba3c6a36f Sync from Piper @453701696
PROTOBUF_SYNC_PIPER
2022-06-08 12:49:35 -04:00
strangewiz
c0fc2e881b
Remove use of sprintf in strutil.cc (#10112)
Co-authored-by: Justin Cohen <justincohen@google.com>
2022-06-07 16:13:33 -07:00
secup
d37cbfd448
Update inlined_string_field.h (#10107)
Modify to #ifdef to prevent certain projects to report warnings are errors. thx u
2022-06-07 16:12:13 -07:00