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

5504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Yang
f69a5db66f
Merge pull request #4028 from TeBoring/3.5.x 
Add backslach to make class explict in global namespace
 2017-12-12 14:28:27 -08:00
Bo Yang
88102eae8f Replace private timelib_update_ts with public date_timestamp_get 2017-12-12 13:57:49 -08:00
Bo Yang
9f6aceaa8c Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp util 
can be used at install time.
 2017-12-12 12:06:51 -08:00
Yilun Chong
5e732e35c1 Add caliper supported to java benchmark 2017-12-12 12:05:29 -08:00
Paul Yang
b1386e77a2
Merge pull request #4026 from TeBoring/3.5.x 
Merge 3.5.0.1 to 3.5.x
 2017-12-11 15:46:44 -08:00
Bo Yang
3b13c3f02e Add backslach to make class explict in global namespace 2017-12-11 15:44:27 -08:00
Bo Yang
fc5818b2bb Merge branch '3.5.0.1' into 3.5.x 2017-12-11 10:50:50 -08:00
Jon Skeet
31c54d1289 Regenerated code from previous C# codegen commit 
With this in place, all tests should pass.

Fixes #3725.
 2017-12-09 09:49:24 +00:00
Jon Skeet
3e5bd2fd24 C# code generation changes to use bitwise comparisons for doubles 2017-12-09 09:49:24 +00:00
Jon Skeet
f3e9a65d75 Compare floating point values bitwise in C# 
This is the manual code part of the Google.Protobuf library, and tests.
Some tests will fail until codegen is changed and rerun.
 2017-12-09 09:49:24 +00:00
Adam Cozzette
618f06fc9c
Merge pull request #4007 from graywolf/patch-1 
--pre is not necessary
 2017-12-08 14:01:49 -08:00
Adam Cozzette
a426833d1a
Merge pull request #4000 from Kwizatz/master 
Using binary one's complement to negate an unsigned int
 2017-12-08 13:34:56 -08:00
Paul Yang
cf7c15e31a
Fix ruby gc_test in ruby 2.4 (#4011) 
* Fix ruby gc_test in ruby 2.4

* Initialize global variables to Qnil.
 2017-12-08 12:38:25 -08:00
Adam Cozzette
9b09a2af14
Merge pull request #4017 from acozzette/update-file-lists 
Ran update_file_lists.sh to update Bazel and CMake file lists
 2017-12-08 11:43:01 -08:00
Adam Cozzette
0fcca8f910
Merge pull request #4018 from acozzette/android-portable-log2-floor 
Use the portable version of Log2Floor for Clang with older Android NDK versions
 2017-12-08 11:42:41 -08:00
Jeffrey Quesnelle
f5b086273a use const char* instead of const std::string& in normalize() 2017-12-07 19:02:35 -05:00
Adam Cozzette
63a0afca70 Use the portable version of Log2Floor for Clang with older Android NDK versions 
This is necessary for avoiding a strange compiler error that we have
already run into with older versions of Clang on NaCl.
 2017-12-07 14:35:40 -08:00
Paul Yang
0e7b589566
Add discard unknown API in ruby. (#3990) 
* Add discard unknown API in ruby.

* Add test for oneof message field.

* Add TestUnknown to represent unknown field data clearly.

* Only serialize the message with unknown fields itself in test.

* Move discard_unknown from Message to Google.Protobuf
 2017-12-07 14:18:38 -08:00
Adam Cozzette
609d752650 Ran update_file_lists.sh to update Bazel and CMake file lists 
This should fix Bazel builds, since those were missing a new file
(implicit_weak_message.cc).
 2017-12-07 14:16:50 -08:00
Jeffrey Quesnelle
b32c2a80e0 fix undefined behavior in C++03 2017-12-07 16:30:24 -05:00
Rodrigo Hernandez
24493eef93 Using binary one's complement to negate an unsigned int 
This removes a Visual Studio warning:

warning C4146: unary minus operator applied to unsigned type, result
still unsigned.
 2017-12-07 13:29:20 -06:00