Commit Graph

7083 Commits

Author SHA1 Message Date
Elliotte Rusty Harold
82db4520a1
Update to 3.10.0 in docs 2019-10-28 06:57:39 -04:00
Rafi Kamal
342a2d627c
Merge pull request #6752 from rafi-kamal/201910111201
Down integrate Google3 changes to Github
2019-10-24 12:03:05 -07:00
Rafi Kamal
5e6d57bd8c Merge branch '201910111201' of https://github.com/rafi-kamal/protobuf into 201910111201 2019-10-23 17:46:09 -07:00
Rafi Kamal
80734b2e1a Reverted changes in conformance/failure_list_js.txt 2019-10-23 17:45:23 -07:00
Christian Maurer
2fc88527e0 c++ remove warning switch contains default but no case 2019-10-23 14:49:28 -07:00
Rafi Kamal
3f4f315266
Merge pull request #6783 from suztomo/install_bom
Installing BOM before running Java test
2019-10-23 12:32:34 -07:00
Rafi Kamal
c0acff1c4e
Merge pull request #6786 from donaldchai/master
Add com.google.truth as test dependencies
2019-10-23 11:40:15 -07:00
Donald Chai
175ddfc175 Add com.google.truth as test dependencies
This goes hand-in-hand with other dependencies like junit, but seems to
only have been used from util/pom.xml.
2019-10-22 20:03:51 -07:00
Tomo Suzuki
ca25badcbe Installing BOM before running Java test 2019-10-22 13:42:35 -04:00
Jan Tattermusch
c08b7512cf
Merge pull request #6759 from ObsidianMinor/csharp/extension-length-checks
Add length checks to ExtensionCollection
2019-10-22 08:24:43 +02:00
Joshua Haberman
9cfb12bf0a Tests pass for all common operations.
A few things that don't work or aren't tested yet:
- wrappers at the top level
- equality checking for not-yet-expanded wrappers.
2019-10-21 09:19:19 -07:00
Joshua Haberman
969d245bd3 WIP: first steps towards lazily creating wrappers. 2019-10-21 07:27:36 -07:00
Christian Maurer
912d8195da c++ remove unused parameters 2019-10-18 16:31:26 -07:00
Christian Maurer
6f0f382d56 c++ remove conversion warning in MapEntryFuncs::ByteSizeLong 2019-10-18 16:30:02 -07:00
woegster
b467aa1614 more potential windows macro redefinition 2019-10-18 15:40:15 -07:00
woegster
bba24bcb6b avoid c++ macro redifitnion on windows 2019-10-18 15:40:15 -07:00
Daniel Johansen
e93dea7746 update Cmake example to build Visual Studio to newest 2019 version. 2019-10-18 15:39:20 -07:00
Jan Tattermusch
2f7f670134
Merge pull request #6530 from prat0088/csharp-ensuresize
c# feature(RepeatedField): Capacity property to resize the internal array
2019-10-18 17:35:12 +02:00
Joshua Haberman
77646a45e2
Merge pull request #6758 from XrXr/ub
Remove unused argument to avoid UB
2019-10-15 23:41:29 -07:00
debugx
9fdb2cf2bb fixed typo 2019-10-15 12:05:14 -07:00
Juraj Lutter
982222e71a Include cmath instead of math.h
This fixes build on, at least, NetBSD 8.1 with gcc 5.5 and SmartOS with gcc 7.
2019-10-15 12:03:08 -07:00
Rafi Kamal
3a505c2ded
Merge pull request #6744 from elharo/patch-5
Java: Update to Guava 28.1-android
2019-10-15 09:00:06 -07:00
Rafi Kamal
e249134eb8
Merge pull request #6756 from haberman/ruby-empty-names
Fixed bug in Ruby DSL when no names are defined in a file.
2019-10-14 10:55:00 -07:00
Rafi Kamal
bf36d04348
Merge pull request #6757 from haberman/ruby-empty-names-release
Ported names fix for Ruby to the release branch.
2019-10-13 22:24:38 -07:00
Sydney Acksman
f50bc62feb Add length checks to ExtensionCollection 2019-10-11 20:23:07 -05:00
Alan Wu
c1ba7c643c Remove unused argument to avoid UB
`OneOfDescriptor_each` is registered as a Ruby method which takes zero
parameters, which means it should take one argument.

When Ruby invokes `OneOfDescriptor_each`, it calls it with one parameter
only, which is one less than what `OneOfDescriptor_each` takes before
this commit. Calling a function with the wrong number of argument is
technically undefined behavior.

See also: §6.5.2.2, N1256
2019-10-11 20:32:35 -04:00
Joshua Haberman
35da84bf64 Ported names fix for Ruby to the release branch. 2019-10-11 14:52:08 -07:00
Joshua Haberman
09a8639482 Fixed bug in Ruby DSL when no names are defined in a file. 2019-10-11 14:22:34 -07:00
Rafi Kamal
27c1defe35
Merge branch 'master' into 201910111201 2019-10-11 12:07:38 -07:00
Rafi Kamal
6c92f9dff1 Down integrate to GitHub 2019-10-11 12:05:46 -07:00
Rafi Kamal
d8e678aae4
Merge pull request #6728 from protocolbuffers/3.10.x-merge
Merge 3.10.x with master and increment the version number
2019-10-10 16:56:19 -07:00
Paul Yang
2dec82e1e0
Fix conformance test (#6750)
* Fix conformance test

Default value of string/message map is not encoded

* Fix zts build
2019-10-10 16:03:52 -07:00
Elliotte Rusty Harold
e7db3d35e4
Update to Guava 28.1-android 2019-10-08 15:44:46 -04:00
Rafi Kamal
7efcc0466c
Change Protobuf BOM license from Apache to BSD 2019-10-07 15:11:37 -07:00
Ricky Pai
e0441b2f28 export third_party BUILD files so they are accessible to users 2019-10-04 08:39:15 -07:00
Benjamin Peterson
5c11b41250 Improve the grammar of the unused import message. 2019-10-04 08:37:29 -07:00
Rafi Kamal
000a8d0902 Removed unnecessary conflict files 2019-10-03 14:38:13 -07:00
Rafi Kamal
2ed41359fe Update version to 3.11.0-RC0 2019-10-03 14:24:27 -07:00
Rafi Kamal
97c7c3fc97 Merge 3.10.x to master 2019-10-03 14:03:38 -07:00
Rafi Kamal
6d4e7fd796
Merge pull request #6721 from protocolbuffers/rafi-kamal-patch-1
Update CHANGES.txt with changes since 3.10.0-RC1
2019-10-02 17:17:27 -07:00
Rafi Kamal
1a57c13086
Update CHANGES.txt with changes since 3.10.0-RC1 2019-10-02 17:06:22 -07:00
Paul Yang
f50204dab4
Initialize well known type values (#6713) (#6714)
* Initialize well known type values

Also fixes #6667

* Revert unwanted change
2019-09-30 15:53:30 -07:00
Paul Yang
a32c2d0306
Initialize well known type values (#6713)
* Initialize well known type values

Also fixes #6667

* Revert unwanted change
2019-09-30 14:43:03 -07:00
Adam Cozzette
f4ceaecf68 Updated deprecation macros to annotate deprecated code 2019-09-30 14:29:24 -07:00
EFanZh
0d1d92d339 Revert "Update signatures of UTF-8 string functions to accept size_t type sizes"
This reverts commit 911e3040fa.
2019-09-30 09:28:27 -07:00
EFanZh
00325ed97b Update signatures of UTF-8 string functions to accept size_t type sizes 2019-09-30 09:28:27 -07:00
EFanZh
a4301ca6eb Cast size_t type to int type explicitly
Currently, the generated header file might cause warnings if user specifies `-Wconversion` compiler option. This commit should be able to fix it.
2019-09-30 09:28:27 -07:00
Nikhil Pothuru
11a5b035da Update README.md (#6708)
* Update README.md

Fixed spelling error

* Update README.md
2019-09-29 19:49:17 -07:00
Andrei-Florin BENCSIK
97b18021f6 Remove unused function and add more UTs
When browsing around the strutil files I found a function
that was never referenced inside the code base
"void StripString(string* s, const char* remove,
-                                 char replacewith);"

The name was kind of misleading as well and it seems like
it's a carbon copy of
"void ReplaceCharacters(string* s, const char* remove,
                                       char replacewith);"
(even the parameter names are the same, the code is the same..)

Is it intentional? Maybe for compatibility reasons? If so,
let's make it deprecated and use the ReplaceCharacters method inside
or the other way around.

Also, noticed there were no tests for "StripString" or "Replace".
Added some for both and planning on maybe making it more C++ish (?)
in another commit.
2019-09-27 16:08:58 -07:00
Changming Sun
95a1c4fbc4 Fix #6098 2019-09-27 15:44:33 -07:00