AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
6,033 Commits 35 Branches 138 Tags 124 MiB
baa4a21130
Commit Graph

6033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Haberman
0ea3d74c3d
Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-style 
Feat: add import-style=commonjs_strict option to the compiler
 2018-07-02 13:58:42 -07:00
Joshua Haberman
e00266a74e
Merge pull request #3847 from FX-HAO/master 
Google::Protobuf::Struct can access a missing key (#3846)
 2018-07-02 13:56:25 -07:00
Adam Cozzette
e0579ac645
Merge pull request #4854 from nehaljwani/win-exports 
Missing symbol exports for Windows DLL
 2018-07-02 10:50:51 -07:00
Feng Xiao
00f118f0c3
Merge pull request #4847 from depristo/master 
Remove write-strings warning from COPTs
 2018-07-02 09:48:11 -07:00
Adam Cozzette
98fcd8762d
Merge pull request #4853 from jnordberg/patch-1 
Add wsrpc
 2018-07-02 09:33:05 -07:00
Nehal J Wani
f2bcc7aca8 Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message> 
This should fix https://github.com/google/protobuf/issues/4717
 2018-07-01 16:14:29 -05:00
Adam Cozzette
1141bd9542 Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options 
This fixes issue #2610.

This was originally fixed in a101fa5289 , but got
reverted by d36c0c538a
 2018-07-01 14:50:37 -05:00
mdepristo
42141fa2f7 Remove unclear comment. 2018-06-30 14:56:19 -07:00
Johan Nordberg
584ed22b25
Add wsrpc 2018-06-30 22:18:37 +02:00
Feng Xiao
da2a6f68db
Merge pull request #4846 from ckhardin/mips-big-endian 
Fix to allow a compilation under mips big endian with gcc
 2018-06-29 21:44:55 -07:00
Thomas Colthurst
1ae2cc02b6 Fix capsule name. (#4836) 
Internal convert file was broken. Change the capsule to the correct name
 2018-06-29 11:07:29 -07:00
depristo
2506cf5cf4 Remove write-strings warning from COPTs. 
This change reduces the excessive warnings when compiling C++ protobufs like "external/protobuf_archive/python/google/protobuf/pyext/message.cc:2629:1: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]"
 2018-06-28 22:54:43 +00:00
Charles Hardin
f1b841b628 Fix to allow a compilation under mips big endian with gcc 
The __MIPSEL__ is mips little endian, specific and we needed
to compile for a big endian mips target that also happened
to be a mips64, so replaced the __MIPSEL__ with a __mip__
which should preserve the build on little endian and allow a
build for a big endian setup.

	$ echo | mips64-linux-gcc -E -dM -
	... snip snip ...
	#define __mips__ 1
	#define __MIPSEB__ 1

Signed-off-by: Charles Hardin <ckhardin@gmail.com>
 2018-06-28 14:29:47 -07:00
Paul Yang
f25e7edfa4
Add -Og to no-warning-test (#4830) 
* Add -Og to no-warning-test

* Initialize value

* Implement PrintFieldName in CompactRepeatedFieldPrinter to prevent Woverloaded-virtual

* Update generated code
 2018-06-28 13:48:06 -07:00
Zachary Anker
70544627cb When initializing a message, skip a field if value is nil (#3693) 2018-06-26 20:27:24 -07:00
Erik Benoist
74f8e24232 Adds a base class for all explicitly raised TypeErrors (#4255) 
* This allows for ruby code to catch and handle Protobuf
    TypeErrors separately from the standard Ruby TypeError

  * Maintains backwards compatibility by having the new
    Google::Protobuf::TypeError inherit from the base
    TypeError. Any code that was catching TypeError should
    continue to work.
 2018-06-26 20:24:24 -07:00
Adam Cozzette
ed00fbbad1
Merge pull request #4828 from mmatuszak-google/patch-1 
Removed forward declaration of MemBlock class
 2018-06-26 17:01:22 -07:00
Michal Matuszak
6489453cf7
Removed forward declaration of MemBlock class 
Removed forward declaration of MemBlock class.

Declaration is in conflict with declaration `::strings::MemBlock`
 2018-06-25 16:42:59 -07:00
Adam Cozzette
d6f346b4d5
Merge pull request #4827 from acozzette/merge-3-6-x 
Merge 3.6.x branch into master
 2018-06-25 15:52:29 -07:00
Sydney Acksman
3d603f481e Remove protoc conditional properties (#4817) 
* Remove protoc conditional properties

* Fix duplicate brace
 2018-06-25 15:21:30 -07:00
Yuchen Xie
595231dd5c Update minimal Python version to 2.7 (#4207) 2018-06-25 15:20:53 -07:00
Pat Moroney
d65d5821bc rename duplicate testMessageSetNullFail function (#3669) 
the testMessageSetNullFail function was declared twice.
So I renamed one to testMessageSetNullFailMap
 2018-06-25 14:57:40 -07:00
Feng Xiao
9fb55c8d29
Merge pull request #4824 from sschuberth/remove-exec-bit 
Remove the executable bit from several source code files
 2018-06-25 14:55:03 -07:00
Feng Xiao
bc21385aa1
Merge pull request #4826 from wittmeie/wittmeie/fix-for-protobuf-generate-output-definitions 
Fixed protobuf_generate output definition
 2018-06-25 14:48:44 -07:00
Vladimir Kovpak
7402555f34 Improved install command. (#4106) 
Added `-y` flag to `sudo apt-get` command.
 2018-06-25 14:20:21 -07:00
Feng Xiao
0b0890b36d
Merge pull request #4608 from khuzemap/master 
Add "override" keyword for overridden virtual functions
 2018-06-25 13:52:55 -07:00
Adam Cozzette
d9ccd0c0e6
Merge pull request #4172 from OskarKinomoto/master 
Add guards against bswap_XX redefnitions
 2018-06-25 13:51:42 -07:00
Adam Cozzette
82d3d7d250 Merge branch '3.6.x' into merge-3-6-x 2018-06-25 13:22:10 -07:00
Paul Yang
f7ada1280f
Build ruby gem on kokoro (#4819) 
* Install rake compiler

* Add kokoro config to build ruby gem on linux

* Rename from linix to linux

* Fix prepare_build.sh name

* Clean up

* Install bundler

* Install bundler

* Use c99 in order to build gem on mingw-32 on ruby 2.0.0

See https://github.com/rake-compiler/rake-compiler-dock/issues/4

* Move c99 config to extcofig.rb
 2018-06-25 11:14:49 -07:00
cclauss
35567c1668 global __version__ In setup.py (#4753) 
This change helps both humans and linters to understand the unusual method of instantiating this global variable.
 2018-06-25 10:50:40 -07:00
Steffen Wittmeier
3e84147d53 Fixed protobuf_generate output definition for files relative to the protobuf_generate command 2018-06-25 11:29:56 +02:00
Sebastian Schuberth
ee03556df9 Remove the executable bit from several source code files 
This potentially avoids compiler warnings.
 2018-06-25 08:17:39 +02:00
Feng Xiao
fc243c15fb
Merge pull request #2470 from xuwei-k/patch-1 
update ScalaPB url
 2018-06-22 21:35:56 -07:00
Feng Xiao
91707246eb
Merge pull request #4168 from jin/master 
Use versions module from Skylib for version checking
 2018-06-22 17:47:17 -07:00
Paul Yang
56d27530ab
Rename build_artifacts.cfg to release.cfg (#4818) 2018-06-22 13:00:55 -07:00
Paul Yang
b907a03185
Add files to build ruby artifact for mac on kokoro (#4814) 
* Add files to build ruby artifact for mac on kokoro

* Move ruby specific stuff to ruby dir
 2018-06-22 10:26:17 -07:00
Adam Cozzette
f42d5923f0
Merge pull request #4815 from vervaekejonathan/master 
Fix parameters declaration
 2018-06-22 10:01:12 -07:00
vervaekejonathan
496822d307
Fix parameters declaration 2018-06-22 14:32:43 +02:00
Feng Xiao
6a4fec616e
Merge pull request #4813 from htuch/fix-any-in-map 
protostream_objectwriter: fix bug when Any is directly embedded in a …
 2018-06-21 16:37:38 -07:00
Feng Xiao
f35669b8d3
Merge pull request #4812 from htuch/fix-any-case 
protostream_objectsource: preserve print options across Any.
 2018-06-21 16:37:22 -07:00
Sydney Acksman
1f77342b78 Add msbuild targets to C# tools for protoc compilers (#4648) 
* Added props to C# tools

* Add targets file to makefile.am
 2018-06-21 14:53:31 -07:00
Feng Xiao
bdf0d1d6f8
Merge pull request #4811 from htuch/invalid-name-json 
json: include field name in InvalidName status messages.
 2018-06-21 12:37:36 -07:00
Harvey Tuch
395ae4f7ad Added TODO for grouping options. 
Signed-off-by: Harvey Tuch <htuch@google.com>
 2018-06-21 15:31:18 -04:00
Harvey Tuch
2d31d0c706 protostream_objectwriter: fix bug when Any is directly embedded in a map. 
This came up when trying to round-trip the JSON<->proto3 conversion for
Envoy's envoy.admin.v2alpha.ConfigDump
(b903c1dc98/api/envoy/admin/v2alpha/config_dump.proto (L29)).

Validated fix on the Envoy code base and via the provided unit test.

Signed-off-by: Harvey Tuch <htuch@google.com>
 2018-06-21 15:24:50 -04:00
Harvey Tuch
0584084b7e protostream_objectsource: preserve print options across Any. 
Fixes #4771. Based on the solution included in the issues from
@wangjinhua.

Validated this works with Envoy's /config_dump JSON rendering.

Signed-off-by: Harvey Tuch <htuch@google.com>
 2018-06-21 14:41:17 -04:00
Harvey Tuch
6eb78b1e84 Additional whitespace. 
Signed-off-by: Harvey Tuch <htuch@google.com>
 2018-06-21 14:09:53 -04:00
Harvey Tuch
44a2a2fcab json: include field name in InvalidName status messages. 
This is invaluable for chasing down the culprit in failed JSON -> proto
conversions. We often see in Envoy that a failed JSON (or indirectly via
YAML) configuration won't load but it's unclear why.

Signed-off-by: Harvey Tuch <htuch@google.com>
 2018-06-21 13:57:31 -04:00
cclauss
e9063ccf19 print() is a function in Python 3 (#4754) 2018-06-20 15:18:20 -07:00
Adam Cozzette
85ba13c9bf
Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6 
Disable thread local storage for OSX < 10.7
 2018-06-20 13:02:16 -07:00
Adam Cozzette
e3ea413ab0
Merge pull request #4780 from mwei0210/master 
check provided size to check whether to export
 2018-06-20 10:48:08 -07:00