AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,423 Commits 35 Branches 138 Tags 124 MiB
7b8f571756
Commit Graph

5423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
96810dea74 Merge branch '3.5.x' of github.com:google/protobuf into changelog 2017-12-19 14:50:32 -08:00
Jisi Liu
eff55ece08
Merge pull request #4074 from pherl/mapat 
Replace C++11 only method std::map::at
 2017-12-19 14:41:13 -08:00
Matt Kwong
8ac050fadd Migrate Jenkins jobs to Kokoro 2017-12-19 13:06:09 -08:00
Jisi Liu
9ce29bd566
Merge pull request #4070 from pherl/3.5.x 
Update version number to 3.5.1
 2017-12-19 12:21:21 -08:00
Jisi Liu
501093d778 Replace C++11 only method std::map::at 2017-12-19 12:20:13 -08:00
Jisi Liu
7bd1606484 Update changelog for 3.5.1 2017-12-19 11:28:30 -08:00
Jisi Liu
050fc9a437 Update version number to 3.5.1 2017-12-19 11:00:33 -08:00
Ubuntu
ffa18ad28f resolve issue 4032 and added a unit test 2017-12-19 11:57:44 +00:00
Miradham Kamilov
03fb09932b Add support for Windows ARM64 build 2017-12-19 14:01:58 +09:00
Thomas Van Lenten
860d693cf7 Add Xcode 9.2 to the testing support 
Fixes #4060
 2017-12-18 10:36:40 -05:00
Feng Xiao
3a06fe1fc9 Fix file permission for python package. 
`umask 0022` makes sure the created package will be accessible by all users.
 2017-12-15 12:57:26 -08:00
Feng Xiao
77d32bc56c
Merge pull request #4053 from xfxyjwf/fixumask 
Fix file permission for python package.
 2017-12-15 12:09:19 -08:00
Paul Yang
c79ba5c1b6
Merge pull request #4034 from TeBoring/php-timestamp-bug 
Avoid calling method from php extension directly
 2017-12-15 10:36:07 -08:00
Adam Cozzette
269884a1eb
Merge pull request #4040 from bazurbat/3.5.x 
Create containing directory before generating well_known_types_embed.cc
 2017-12-15 10:27:30 -08:00
Feng Xiao
0fc85acdf2 Fix file permission for python package. 
`umask 0022` makes sure the created package will be accessible by all users.
 2017-12-14 17:54:18 -08:00
Yilun Chong
4b0209140e add cpp 2017-12-14 17:26:16 -08:00
Adam Cozzette
396336eb96
Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054 
Java: generate an annotation to suppress deprecation warnings
 2017-12-14 15:53:23 -08:00
Bo Yang
8d6f13e86d Fix for php5.5 2017-12-14 13:24:00 -08:00
Jisi Liu
1237c3f1f7
Merge pull request #4045 from pherl/deprecate 
Add deprecation annotation for oneof case.
 2017-12-14 12:20:26 -08:00
Jisi Liu
d971cbfc27
Merge pull request #4049 from pherl/py26 
Remove py2.6 support.
 2017-12-14 11:51:34 -08:00
Bo Yang
39159c89f1 Accept DatetimeInterface in fromDatetime 2017-12-14 11:33:34 -08:00
cyyber
0e2089c775 Calling Keychecker before checking key in MessageMap 2017-12-15 01:01:31 +05:30
Jisi Liu
acadade56e Remove py2.6 support. 2017-12-14 11:26:58 -08:00
Jisi Liu
594ec2262c Fix python descriptor test. 2017-12-14 11:16:34 -08:00
Yilun Chong
cd32aae377 Merge branch 'master' of https://github.com/google/protobuf into JavaCaliper 2017-12-13 17:21:58 -08:00
Yilun Chong
75523ec086 fix bugs 2017-12-13 17:21:33 -08:00
Bo Yang
1a549d9a90 Avoid using php_date_get_date_ce() in case date extension is not 
available.
 2017-12-13 17:09:55 -08:00
Adam Cozzette
03501110cc Generate an annotation to suppress deprecation warnings 
The valueOf method on enums is deprecated, but for compatibility reasons
the generated code has to keep using it. We can use an annotation to
suppress the deprecation warnings.
 2017-12-13 16:41:43 -08:00
Jan Tattermusch
426cf6f31e Add auto-generated header to C# generated files (#4038) 
* Add auto-generated header to C# generated files

* regenerate C# protos
 2017-12-13 14:36:29 -08:00
Yilun Chong
34843eddfe Fix bugs 2017-12-13 14:34:52 -08:00
Feng Xiao
a4f68d479a
Merge pull request #4044 from xfxyjwf/issue3268 
Avoid double underscores in macro name
 2017-12-13 14:29:20 -08:00
Adam Cozzette
00ac5c1ab6
Merge pull request #4041 from acozzette/fix-license-issue-1775 
Added our standard license header to structurally_valid.cc and its test
 2017-12-13 14:16:50 -08:00
Jisi Liu
22e1cfd84a Add deprecation annotation for oneof case. 2017-12-13 14:09:50 -08:00
Feng Xiao
b3ac4417b7 Update generated code. 2017-12-13 13:49:26 -08:00
Jie Luo
bfd254e14f
Add unknown field support for csharp (#3936) 
Add unknown field support for csharp
 2017-12-13 13:48:58 -08:00
Feng Xiao
50ef6a623e Avoid two consecutive underscores in macro name. 
Fixes https://github.com/google/protobuf/issues/3268
 2017-12-13 13:40:19 -08:00
Jisi Liu
82724e2109
Merge pull request #4042 from pherl/cpp_enum 
Use matching enum type for IsPOD.
 2017-12-13 13:29:18 -08:00
Jisi Liu
8521624e93
Merge pull request #4043 from pherl/flush 
Explicitly propagate the status of Flush().
 2017-12-13 13:28:23 -08:00
Feng Xiao
0a7120ac32
Merge pull request #4037 from xfxyjwf/issue2880 
Clarify default value behavior in JSON conversion.
 2017-12-13 13:25:38 -08:00
Jisi Liu
6b01e6440c Explicitly propagate the status of Flush(). 
Before the change, an implicit Flush() will be triggered in the
destructor of the input stream. However, the return code of Flush() is
not discarded. This change makes sure when Flush() fails, we will
return false.
 2017-12-13 13:06:29 -08:00
Jisi Liu
7ef21dd81b Use matching enum type for IsPOD. 2017-12-13 13:00:02 -08:00
Adam Cozzette
ecab9c65fb Added our standard license header to structurally_valid.cc and its test 
This fixes issue #1775.
 2017-12-13 10:01:14 -08:00
Oleg Kolosov
edcf15e7f4 Create containing directory before generating well_known_types_embed.cc 
This fixes the following build error:

oldpwd=`pwd` && cd .../protobuf/src && \
$oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc
/bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory
Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed

which is observed during the cross-compilation since the version 3.2.
 2017-12-13 12:37:24 +01:00
Feng Xiao
5ce724bceb
Merge pull request #4036 from xfxyjwf/issue3093 
Update comments for Timestamp JSON format.
 2017-12-12 17:52:32 -08:00
Bo Yang
fffe8d39f8 Call php method via function name instead of calling directly. 
This changes the linking error if php extension is not statically linked
to a runtime error. In this way, users who don't need Timestamp can
still use protobuf even if date extension is not statically linked in
php.
 2017-12-12 17:47:04 -08:00
Jisi Liu
0f9bfa8244
Merge pull request #4016 from jquesnelle/string-access-ub 
fix undefined behavior in C++03
 2017-12-12 17:16:51 -08:00
Jisi Liu
27e877fdaa
Merge pull request #2834 from aj-michael/master 
Make //:protobuf_python have correct __init__.py.
 2017-12-12 16:22:47 -08:00
Feng Xiao
6c27550df0 Clarify default value behavior in JSON conversion. 
Make it clear default value is only omitted for proto3.
 2017-12-12 15:11:40 -08:00
Feng Xiao
75eceb8424 Update generated code. 2017-12-12 14:57:34 -08:00
Feng Xiao
8489612dad Update comments for Timestamp JSON format. 
Clarify that JSON parser are required to accept both UTC and other
timezone offsets.

Fixes issue 3093
 2017-12-12 14:32:28 -08:00