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.)
2 years ago
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.
2 years ago
Joshua Haberman
c38281dd20
Merge pull request #10102 from fiboknacky/update-fielddescriptor
...
Exposed more functions in FieldDescriptor and OneofDescriptor.
2 years ago
Elliotte Rusty Harold
a612a75b68
Merge pull request #10130 from elharo/sync-stage
...
Integrate from Piper for C++, Java, and Python
2 years ago
Elliotte Rusty Harold
b53e63bae1
update CHANGE list
2 years ago
Elliotte Rusty Harold
81fc22c8ab
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Elliotte Rusty Harold
5a9bf6c7de
Sync from Piper @454255492
...
PROTOBUF_SYNC_PIPER
2 years ago
Elliotte Rusty Harold
9f53ec3996
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Elliotte Rusty Harold
24dad62f40
Sync from Piper @454225000
...
PROTOBUF_SYNC_PIPER
2 years ago
Elliotte Rusty Harold
70e2923365
update CHANGE list
2 years ago
Elliotte Rusty Harold
31ba940bfe
Merge tag 'refs/tags/sync-piper' into sync-stage
2 years ago
Elliotte Rusty Harold
ce537e8a3e
Sync from Piper @454206746
...
PROTOBUF_SYNC_PIPER
2 years ago
Marc Plano-Lesay
85225b83c3
Remove unused Offset function ( #10120 )
...
This fails to build with -Werror.
3 years ago
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.
3 years ago
Chenwei Xiao
1bbf6f37cc
Correct file extention of README ( #10125 )
3 years ago
YJ
2bc5f95fe3
add missing quotes ( #10123 )
3 years ago
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.
3 years ago
Elliotte Rusty Harold
2b19a8062a
update CHANGE list
3 years ago
Elliotte Rusty Harold
f5ba6c8610
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
Elliotte Rusty Harold
9e24b1912e
Sync from Piper @453894829
...
PROTOBUF_SYNC_PIPER
3 years ago
Thanet (Knack) Praneenararat
0f1574aae2
Fixed bugs of OneofDescriptor.
3 years ago
Elliotte Rusty Harold
0a16bdfbe6
Ignore configure~ ( #10117 )
...
fixes #9974
@acozzette
3 years ago
Elliotte Rusty Harold
4d96482e72
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
Elliotte Rusty Harold
3ba3c6a36f
Sync from Piper @453701696
...
PROTOBUF_SYNC_PIPER
3 years ago
strangewiz
c0fc2e881b
Remove use of sprintf in strutil.cc ( #10112 )
...
Co-authored-by: Justin Cohen <justincohen@google.com>
3 years ago
secup
d37cbfd448
Update inlined_string_field.h ( #10107 )
...
Modify to #ifdef to prevent certain projects to report warnings are errors. thx u
3 years ago
mkruskal-google
3380463ff8
Deleting python release kokoro setup. This has been replaced by upb's python release ( #10055 )
3 years ago
Thanet (Knack) Praneenararat
594f2a9b0d
Fixes bugs of isSynthetic and makes containing_oneof work
3 years ago
Thanet (Knack) Praneenararat
238331b359
Added support for getRealContainingOneof() and getContainingOneof()
3 years ago
zhangskz
0663080c5a
Revert third party/benchmark commit from Piper integrate and add ignore=dirty to submodule ( #10104 )
...
* Revert change to third_party/benchmark from Piper->Github sync
* Add ignore=dirty to third_party/benchmark submodule
3 years ago
Namgoo Lee
e7cc1aa970
remove const from function return type if returning const value ( #10101 )
3 years ago
zhangskz
4548b4ac0e
Merge pull request #10103 from zhangskz/sync-stage
...
Integrate from Piper for C++, Java, and Python
3 years ago
Sandy Zhang
f138d5de25
Sync from Piper @452551755
...
PROTOBUF_SYNC_PIPER
3 years ago
Sandy Zhang
2ad33999ee
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
Thanet (Knack) Praneenararat
b27dd18676
Exposed more functions in FieldDescriptor and OneofDescriptor.
3 years ago
David L. Jones
67f46d2495
Switch normal macos build to use cmake. ( #10092 )
3 years ago
David L. Jones
dc14b4be42
Change update_file_lists.sh to work based on Bazel-generated file lists ( #10091 )
...
This commit changes update_file_lists.sh to use Bazel as the source of truth. Currently, only the cmake build is actually affected, but Automake should be fairly straightforward to convert.
The file lists were originally factored out in PR#10027. This commit actually switches over to the Bazel-generated lists.
3 years ago
appledragon
45b7f62b1b
use char to find instead of string ( #10094 )
...
* [Bazel] Add a doc explaining our C++ build systems and distribution archives. (#10073 )
* use char to find instead of string
Co-authored-by: David L. Jones <dlj@google.com>
3 years ago
David L. Jones
bd85edfbd9
[Bazel] Add a doc explaining our C++ build systems and distribution archives. ( #10073 )
3 years ago
David L. Jones
74b2c7c7ce
Move cmake file lists into src/file_lists.cmake. ( #10027 )
...
This is in preparation for generating file lists automatically.
I am putting the list of files under src/, not under cmake/, so that it will be next to the file list for automake (see #10029 ). I can certainly put the list back under cmake/, but in general, I think we probably want to move the cmake targets e.g. to src/CMakeLists.txt anyhow.
3 years ago
David L. Jones
c2e99db90b
Add filegroups for test sources and include them in file lists. ( #10049 )
...
These will be used to generate lists of sources for non-Bazel builds.
3 years ago
zhangskz
1ec6f26ce7
Remove expected cmake failure due to missing abseil sources, since ab… ( #10089 )
...
* Remove expected cmake failure due to missing abseil sources, since absl dep was rolled back
* Add back cmake.sh run using extracted sources
3 years ago
bttk
85fcd02e32
Remove merge markers from BUILD.bazel and fix incorrect merge ( #10084 )
...
* Remove merge markers from BUILD.bazel
* fix build errors
3 years ago
zhangskz
045172f35a
Merge pull request #10072 from protocolbuffers/main-202205272356
...
Merge 21.x to main after 21.1 release
3 years ago
Dennis Shao
a11fa4529f
Merge pull request #10059 from shaod2/sync-stage
...
Integrate from Piper for C++, Java, and Python
3 years ago
Sandy Zhang
e16d9348d7
Fix php generator merge to include php revert change from 21.x
3 years ago
Sandy Zhang
15e09f56b0
Fix unsaved merge resolution
3 years ago
Sandy Zhang
258514019f
Merge 21.x into main
3 years ago
zhangskz
55fe00e35e
Merge pull request #10071 from protocolbuffers/21.x-202205272218
...
Update version.json to 21.2-dev
3 years ago
zhangskz
fd896733a5
Merge branch '21.x' into 21.x-202205272218
3 years ago