Commit Graph

5254 Commits

Author SHA1 Message Date
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
Feng Xiao
5ce724bceb
Merge pull request #4036 from xfxyjwf/issue3093
Update comments for Timestamp JSON format.
2017-12-12 17:52:32 -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
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
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
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
W
0316ae802d
--pre is not necessary
--pre was not necessary to install google-protobuf when I tried it today (2017-12-06).
2017-12-06 18:18:50 +01:00
Adam Cozzette
9021f623e1
Merge pull request #3988 from acozzette/down-integrate
Integrated internal changes from Google
2017-12-05 13:02:36 -08:00
Yilun Chong
173f3043d3
Merge pull request #3926 from BSBandme/down_sync_benchmark
Sync benchmark changes from internal
2017-12-05 10:54:14 -08:00
Adam Cozzette
e372df5c97 Fixed failing JS tests 2017-12-05 10:41:31 -08:00
Feng Xiao
db7c043f6d
Merge pull request #3968 from fahhem/patch-2
Add a check_version() for use in WORKSPACEs
2017-12-04 15:28:56 -08:00
Fahrzin Hemmati
35119e39a0 Add a check_protobuf_required_bazel_version() for use in WORKSPACEs 2017-12-04 15:12:08 -08:00
Yilun Chong
1fd6c1761e Fix bugs to pass tests 2017-12-04 14:39:08 -08:00
Adam Cozzette
7bb8584f9d Updated conformance failure lists 2017-12-04 14:14:29 -08:00
Thomas Van Lenten
716acc3b97 Remove Xcode directives on some configs.
Travis changed their default image:
https://blog.travis-ci.com/2017-11-21-xcode8-3-default-image-announce

So there is no need to set a specific image any more, and the non
apple language tests should be able to use the default images.
2017-12-04 12:48:12 -05:00
Yilun Chong
1c062a65af Sync internal benchmark changes 2017-12-01 11:55:38 -08:00
Adam Cozzette
5d647e19e7 Updated Makefile.am to add a new file to EXTRA_DIST 2017-12-01 11:22:17 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Adam Cozzette
a711e3d5b4
Merge pull request #3979 from acozzette/3.5.x-merge
Merge 3.5.x branch into master
2017-12-01 07:31:37 -08:00
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Paul Yang
94bb1eed17
Remove duplicate typedef. (#3975) 2017-11-30 12:21:00 -08:00
Paul Yang
74e7decbbf
Provide discardUnknonwnFields API in php (#3976)
* Provide discardUnknownFields API in php implementation

* Provide discardUnknownFields API in php c extension.
2017-11-30 12:19:50 -08:00
Feng Xiao
6de51caed5
Merge pull request #3824 from anuraaga/dev_rag
[Java] Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
2017-11-30 11:03:46 -08:00
Feng Xiao
da89eb25ef
Merge pull request #3955 from linux-on-ibm-z/master
Adding Release_CompareAndSwap 64-bit variant
2017-11-30 10:44:11 -08:00
Jie Luo
6d6099553b
Update csharp version number (#3958) 2017-11-29 16:10:44 -08:00
Joshua Haberman
0289dd8f90
Merge pull request #2519 from rubynerd-forks/ruby-fix-repeated-message-type-field
unwrap descriptor class before comparison of RepeatedField types
2017-11-29 10:07:35 -08:00
Jon Skeet
74f64b667c Fix JsonTokenizer exception message 2017-11-29 07:14:57 +00:00
Anuraag Agrawal
3e944aec9e Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. 2017-11-29 15:44:58 +09:00
Adam Cozzette
3c6fd3f7f9
Merge pull request #3960 from acozzette/libprotoc-export-fix
Added back in LIBPROTOC_EXPORT which was removed by mistake
2017-11-28 16:54:55 -08:00
Adam Cozzette
1b1d1ea340 Added back in LIBPROTOC_EXPORT which was removed by mistake 2017-11-28 07:28:26 -08:00
Adam Cozzette
34e30e5c1b
Merge pull request #3962 from jleni/fix_dotnet
Upgrading dotnet to 1.0.4
2017-11-28 07:23:31 -08:00
Juan Leni
582d6ac3aa Upgrading dotnet to 1.0.4 2017-11-28 05:18:25 +01:00
Jisi Liu
f2127b667e
Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404
[PROTOBUF-3404] add --with-zlib=PATH to configure.ac script
2017-11-27 09:45:36 -08:00
Nayana-ibm
642e1ac635 Adding Release_CompareAndSwap 64-bit variant 2017-11-27 05:43:30 -05:00
Xiaoshuang LU
8ff2284456 [PROTOBUF-3404] add --with-zlib=PATH to configure.ac script 2017-11-23 10:53:31 +08:00
Jisi Liu
cf65a7946f Update version for 3.5.0.post1 2017-11-22 14:05:10 -08:00