Commit Graph

6722 Commits

Author SHA1 Message Date
Paul Yang
9a8ef05a34
Append field number to accessors if there is conflict (#6169)
Previously, foo_value and foo (wrapper field) will both have get/setFooValue
2019-05-24 10:00:09 -07:00
Alex Konradi
b44a1364ec
Add extension number for protoc-gen-validate
This project is used by the [Envoy proxy](https://www.envoyproxy.io/) and several others.

The existing code is using the extension value [919191](54b08a686f/validate/validate.proto (L29)) but since maintaining binary compatibility is not important, it shouldn't be a problem to change once this allocation is approved.
2019-05-24 07:44:51 -04:00
Hao Nguyen
f9cd7bd9b3 Upgrade gulp version 2019-05-23 16:31:06 -07:00
Hao Nguyen
6d83327a86 Fix gulpfile to use gulp 4 API 2019-05-23 15:24:02 -07:00
Hao Nguyen
affe9c200a
Merge pull request #6161 from haon4/201905211601
Down integrate to GitHub
2019-05-22 14:30:49 -07:00
Hao Nguyen
e038b1e7c0
Merge pull request #6164 from haon4/cherrypick_fix_build
Cherrypick 014872a962 to fix build
2019-05-22 13:55:48 -07:00
Mike Moore
565154af78
Remove Ruby to_hash methods 2019-05-22 13:21:51 -06:00
Seth Girvan
014872a962 Revert "protobuf.pc.in does not reflect CXXFLAGS"
This reverts commit a7180caf19.
2019-05-22 10:56:59 -07:00
Hao Nguyen
582927ae2a Update generated files 2019-05-21 16:42:33 -07:00
Hao Nguyen
88339fa7f8 Down integrate to GitHub 2019-05-21 16:02:13 -07:00
Hao Nguyen
b0d648664d Update protobuf version 2019-05-21 14:07:13 -07:00
Hao Nguyen
46d5cc7de5 Revert "Revert "Add new file to package.xml (#6116)""
This reverts commit 783971e872.
Revert an accidental revert!
2019-05-21 13:50:54 -07:00
Hao Nguyen
2352a30e66 Revert "Update protobuf version"
This reverts commit 6d96493b31.
2019-05-21 13:49:06 -07:00
Hao Nguyen
783971e872 Revert "Add new file to package.xml (#6116)"
This reverts commit c40018e52d.
2019-05-21 13:48:34 -07:00
Hao Nguyen
6d96493b31 Update protobuf version 2019-05-21 13:31:01 -07:00
Yilun Chong
0c3f43a619
Merge pull request #6158 from TechProofreader/patch-2
Update performance.md
2019-05-21 11:25:20 -07:00
TechProofreader
02a4c720c3
Update performance.md
Even though I just proofread this file, I noticed one more thing that needed correcting, which I fixed. The word "genereated" had to be corrected to "generated". My apologies for missing this on the initial check.
2019-05-21 03:18:36 -04:00
Hao Nguyen
fcfc47d405
Merge pull request #6151 from haon4/201905171200
Down Integrate to GitHub
2019-05-20 10:26:25 -07:00
Yilun Chong
1bc8cbe14b
Merge pull request #6153 from TechProofreader/patch-1
Update performance.md
2019-05-19 20:30:27 -07:00
TechProofreader
5b628d552b
Update performance.md
I corrected a few grammatical mistakes and increased the document's readability by easing the language flow.
2019-05-18 01:04:58 -04:00
Paul Yang
c40018e52d
Add new file to package.xml (#6116) 2019-05-17 15:19:46 -07:00
Hao Nguyen
66540237ca Down integrate to GitHub 2019-05-17 12:01:17 -07:00
Yilun Chong
b4f193788c
Merge pull request #6115 from haon4/javalite_doc
Update instruction on how to use JavaLite runtime
2019-05-14 18:04:33 -07:00
Yilun Chong
1ded7fbb7d
Merge pull request #6138 from haoyuanli/patch-1
Fix typo 'pythong'
2019-05-14 17:52:15 -07:00
Joshua Haberman
d41002663f
Merge pull request #6139 from haberman/conformance-build
Typo fix for conformance test runner.
2019-05-14 17:05:45 -05:00
Joshua Haberman
7980ad8e1c
Merge pull request #6140 from protocolbuffers/revert-6128-convert-to-ruby
Revert "Convert Google::Protobuf.deep_copy to pure Ruby"
2019-05-14 17:04:54 -05:00
Joshua Haberman
d57581348d
Revert "Convert Google::Protobuf.deep_copy to pure Ruby" 2019-05-14 14:25:11 -07:00
Joshua Haberman
c659a4a4db Fixed typo: conformance_test_runner should be a binary, not library. 2019-05-14 14:01:16 -07:00
Joshua Haberman
0acd543dc4 Merge branch 'master' into conformance-build 2019-05-14 13:59:26 -07:00
Joshua Haberman
16d0021356
Merge pull request #6128 from tenderlove/convert-to-ruby
Convert Google::Protobuf.deep_copy to pure Ruby
2019-05-14 13:04:30 -05:00
haoyuanli
62246b9166
Fix typo 'pythong'
Changed 'pythong' to 'python'
2019-05-14 10:47:09 -07:00
Hao Nguyen
5f3f3d646d
Merge pull request #6133 from haon4/fix_update_pbh
Make sure to return the updated line when modifying .pb.h file
2019-05-13 19:36:42 -07:00
Hao Nguyen
01a0a355ba
Merge pull request #6132 from haon4/fix_build
Make sure to include zlib.BUILD in our distribution
2019-05-13 19:16:23 -07:00
Hao Nguyen
3986786182 Make sure to return the updated line when modifying .pb.h file 2019-05-13 17:25:48 -07:00
Hao Nguyen
166652fc6f
Merge pull request #6127 from haon4/201905131051
Down integrate to GitHub
2019-05-13 17:00:12 -07:00
Hao Nguyen
87f83cc1e8 Make sure to include zlib.BUILD in our distribution 2019-05-13 16:38:07 -07:00
Aaron Patterson
3b67455319
Convert Google::Protobuf.deep_copy to pure Ruby
In general, I think it will help us to debug issues if we have less C
code and more Ruby code.  This method can be implemented in pure Ruby,
so this commit converts it to pure Ruby.
2019-05-13 15:37:13 -07:00
Hao Nguyen
3d1b5d7280 Move CreateUnknownEnumValues to anonymous namespace 2019-05-13 14:23:36 -07:00
Hao Nguyen
34af356256 Remove inline from generated_message_reflection 2019-05-13 13:09:49 -07:00
Hao Nguyen
a1c8868344 Down integrate to GitHub 2019-05-13 10:52:29 -07:00
Joshua Haberman
78ca77ac87
Added conformance tests to Bazel BUILD file (#6126) 2019-05-13 12:09:36 -05:00
Joshua Haberman
2996da4d81 Merge branch 'master' into conformance-build 2019-05-13 07:45:30 -07:00
Ruslan Manaev
982d5d2ab1 Fix compilation error with SDL check flag in Visual Studio 2019-05-10 14:14:33 -07:00
Adam Cozzette
531505ca13 Updated gemspec to require Ruby 2.3 or higher 2019-05-10 11:36:35 -07:00
Seth Girvan
cdf873f29b Revert "protobuf.pc.in does not reflect CXXFLAGS"
This reverts commit a7180caf19.
2019-05-10 11:32:20 -07:00
Parnic
55f89a10fa Don't build io_win32 for Xbox One
This file contains a lot of code that doesn't compile for Xbox One and doesn't appear to be necessary for usage on that platform. _WIN32 is defined for the Xbox One platform.
2019-05-10 11:11:27 -07:00
Parnic
3691c172c9 Replaced unavailable include with struct definition for Xbox One
It appears this file was including winsock2.h just to get the timeval struct definition. There are platforms, such as Xbox One, that don't use winsock but do compile with _MSC_VER set, so just drop in the struct definition we needed instead of including all of winsock. This fixes compilation of this file for Xbox One. Without this change, there were numerous `timeval` complaints such as
```
1>c:\dev\protobuf\src\google\protobuf\util\time_util.h(153): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int (compiling source file C:\dev\protobuf\src\google\protobuf\util\time_util.cc)
1>c:\dev\protobuf\src\google\protobuf\util\time_util.h(153): error C2143: syntax error: missing ',' before '&' (compiling source file C:\dev\protobuf\src\google\protobuf\util\time_util.cc)
```
etc.
2019-05-10 11:11:27 -07:00
Per Lundberg
2bb7c278c2 Fix typo 2019-05-10 11:10:27 -07:00
Paul Yang
7597f8ad24
Custom mktime to fix issue on mac (#6118)
* Custom mktime to fix issue on mac

* Remove succeeded tests from failure list
2019-05-09 20:51:35 -07:00
Hao Nguyen
c08249b414
Merge pull request #6121 from haon4/csharp_fix
Fix update_version script to use the appropriate rc style for C#
2019-05-09 07:17:12 -07:00