Commit Graph

6722 Commits

Author SHA1 Message Date
Hao Nguyen
1467e08d7c Down integrate to Github 2019-04-12 13:10:30 -07:00
Hao Nguyen
1a23e2ab2d Replace SimpleItoa with StrCat 2019-04-12 11:50:15 -07:00
senhalil
97e7ddc015 Small patch to handle -Wfloat-equal warnings
https://groups.google.com/d/msg/protobuf/H8_D1hfg3p4/A2oPHdfUAgAJ
2019-04-11 15:54:23 -07:00
Justin Buchanan
27228494c3 emit annotations for oneof field accessors in c++ 2019-04-11 15:53:09 -07:00
Keith Smiley
da5e11b605 Remove unused constants
When compiling protobuf these produce warnings
2019-04-11 15:41:54 -07:00
Keith Smiley
7db639f924 Make cold_threshold_ look used to fix warning
This field isn't used yet, but it will be in the future so we don't want
to remove it. This fixes the warning in the meantime.
2019-04-11 15:41:26 -07:00
Hao Nguyen
105a0666d3
Merge pull request #6016 from haon4/201904101300
Down integration to GitHub
2019-04-10 15:07:04 -07:00
Hao Nguyen
466615a8e2 Remove Required.Proto3.JsonInput.EmptyFieldMask.JsonOutput from ruby_mac too 2019-04-10 13:52:28 -07:00
Hao Nguyen
3d69bad4b2 Update generated proto and remove a test from failure_list 2019-04-10 13:33:56 -07:00
Hao Nguyen
51b0225599 Down integrate to Github 2019-04-10 13:00:25 -07:00
Hao Nguyen
825c5bf4e9
Merge pull request #6003 from haon4/documentation
Update documentation for JavaLite
2019-04-09 20:05:56 -07:00
Hao Nguyen
93a18cf2be
Merge pull request #6007 from haon4/mergeable2
Add Mergeable config
2019-04-09 18:39:15 -07:00
Hao Nguyen
925aa60ff2 Add Mergeable config 2019-04-09 17:33:43 -07:00
Hao Nguyen
92e824e505 Add a link to the older version of JavaLite 2019-04-09 15:07:44 -07:00
Hao Nguyen
1da2a67429 Update documentation for JavaLite 2019-04-09 13:07:25 -07:00
Hao Nguyen
5b232b8ecb
Merge pull request #6001 from haon4/sync201904090622
Down integrate to Github
2019-04-09 10:40:46 -07:00
Hao Nguyen
ef1e8e7172 Add module for JavaLite and fix builds 2019-04-09 06:48:01 -07:00
Hao Nguyen
6dc9832aab Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622 2019-04-09 06:25:48 -07:00
Hao Nguyen
176f7db11d Down integrate to Github 2019-04-09 06:23:32 -07:00
yejianwu
df4ec8a273 support specify C++ STL for android 2019-04-08 14:01:34 -07:00
Hao Nguyen
c163a2d1a4 Revert accidentally commit 2019-04-05 17:09:42 -07:00
Hao Nguyen
1eb049141e Add module for JavaLite and fix builds 2019-04-05 16:55:34 -07:00
Hao Nguyen
86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf 2019-04-05 16:41:24 -07:00
Hao Nguyen
a48a574f7e Down integrate to Github 2019-04-05 16:39:18 -07:00
Ankit Singh
1065652bf9 Removes unused code and lint warnings (#5773) 2019-04-03 10:51:33 -07:00
Phillipp Schoppmann
8e5b2f1b82 Update file list for protobuf_lite 2019-04-01 14:06:18 -07:00
Harvey Tuch
0f8e6d1402 Fix some UBSAN warnings.
* external/com_google_protobuf/src/google/protobuf/stubs/strutil.cc:1122:9: runtime error: negation of -9223372036854775808 cannot be represented in type 'google::protobuf::int64' (aka 'long'); cast to an unsigned type to negate this value to itself

* Bad external/com_google_protobuf/src/google/protobuf/text_format.cc:1320:14: runtime error: null pointer passed as argument 1, which is declared to never be null
  /usr/include/string.h:62:62: note: nonnull attribute specified here

Signed-off-by: Harvey Tuch <htuch@google.com>
2019-04-01 14:00:39 -07:00
Paul Yang
f425b9f059
Merge pull request #5953 from acozzette/merge-3-7-x
Merge 3.7.x into master
2019-03-28 17:28:22 -07:00
Hao Nguyen
3efc3fd4f5
Upgrade the closure compiler version (#5955)
Also update Dockerfile for JavaScript. The old one is using an npm that is too outdated
2019-03-28 09:54:13 -07:00
Adam Cozzette
8018e45e87 Removed duplicate text from WORKSPACE file 2019-03-28 09:48:40 -07:00
Bo Yang
33dd96c23f Use mktime 2019-03-28 06:38:20 +00:00
Bo Yang
262cc06075 Fix ruby conformance test on mac 2019-03-28 06:35:07 +00:00
Bo Yang
2d9507ec74 Update upb for ruby 2019-03-28 02:17:39 +00:00
Ben Boeckel
2350e20cae mathlimits: remove no-op macro expansion code 2019-03-27 17:07:57 -07:00
Ben Boeckel
3071fc311b mathlimits: remove unused code
This actually has always been using the first branch because
`__cpluscplus` is not a real definition (contrast with the real spelling
of `__cplusplus`).
2019-03-27 17:07:57 -07:00
Ben Boeckel
e5862cd912 mathlimits: check for _WIN32 and __MINGW32__ existence 2019-03-27 17:07:57 -07:00
Ben Boeckel
ec70372f85 command_line_interface: check if __APPLE__ is defined 2019-03-27 17:07:57 -07:00
Bo Yang
a268b63284 Update upb for ruby 2019-03-27 21:19:01 +00:00
Bo Yang
cd044e9cbb Sync latest upb changes 2019-03-27 18:15:24 +00:00
Joe Bolinger
e4bbca1fc5 Add wrapper type helpers for Ruby (#5739)
* add wrapper type helpers

* add check for _as_value suffix
2019-03-27 09:44:43 -07:00
Joe Bolinger
d2daa38986 Add native type setters for Timestamp and Duration in Ruby (#5751)
* add implicit time conversion

* add duration

* add init test

* more tests

* add type check and alternative c type check

* add rational and bigdecimal

* use rb_obj_is_kind_of

* use native time check

* chain implicit conversions

* remove unused variable
2019-03-26 16:48:24 -07:00
Adam Cozzette
8645d893ab Merge branch '3.7.x' into merge-3-7-x 2019-03-26 14:32:20 -07:00
Pavel Perestoronin
e9faff8514 Update third_party.md
I've deprecated the separate web page for the project and moved everything to `README.md`, so for now it's better to point to the GitHub project page.
2019-03-26 13:35:54 -07:00
Paul Yang
6973c3a504
Update version number to 3.7.1 (#5947)
* Update version number to 3.7.1

* Update version number in port_def.inc
2019-03-26 09:30:12 -07:00
Adam Cozzette
077079573f Fixed CI failures with Ruby 2.3 on OSX (#5948)
OSX has deprecated OpenSSL, so we need to install it via Homebrew and
build against that version when we build Ruby.
2019-03-25 17:19:48 -07:00
Benjamin Peterson
5939bc3619 Fix "the the". 2019-03-25 13:38:06 -07:00
Adam Cozzette
34b64995ac Avoid linking against libatomic when building protoc (#5922)
We ran into problems with precompiled protoc binaries not working on
some systems because of the dependence on a dynamically linked
libatomic. However, I found that linking against libatomic is not
actually necessary in our protoc build environment. Inside configure.ac
there's a test which figures out if we need to pass -latomic, and it
does this by attempting to build a test binary. That binary was failing
to build, but it turns out this was because we need to pass -std=c++11,
not -latomic.

This fixes #5875.
2019-03-25 11:00:19 -07:00
Paul Yang
ba42cb53d9
Allow bytes field to be longer than 16000 bytes (#5924)
* Allow bytes field to be longer than 16000 bytes

* Remove empty line
2019-03-25 10:51:18 -07:00
Adam Cozzette
02cf61a7da Updated NPM version to 3.7.1 2019-03-25 09:52:46 -07:00
myd7349
ec0d47e4d2 No define strtoll/strtoull for VS2013 and above 2019-03-25 09:52:00 -07:00