Commit Graph

5423 Commits

Author SHA1 Message Date
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
Paul Yang
c370f88fb1
Recursively clear unknown fields in submessages. (#3982)
* Recursively clear unknown fields in submessages.

* Recursively discard unknown fields in submsg for c extension

* Fix zts build

* Add comment for tests

* Add a TODO to add a util for encoding varint for better readability.

* Add test for oneof message field.
2017-12-07 11:16:47 -08:00
Jisi Liu
1b5b3b2839
Merge pull request #4013 from laszlocsomor/io_win32
io_win32: support non-ASCII paths
2017-12-07 11:16:08 -08:00
Laszlo Csomor
a3a1c93fb4 io_win32_unittest: remove incorrect error check
Unlike GetEnvironmentVariableW,
GetCurrentDirectoryW doesn't set
ERROR_INSUFFICIENT_BUFFER.
2017-12-07 15:31:49 +01:00
Laszlo Csomor
eb3bd6ec29 io_win32_unittest: fix condition in GetCwdAsUtf8 2017-12-07 15:31:49 +01:00
Laszlo Csomor
3f1b1a6da5 io_win32_unittest: use CWD as last tempdir
If the test cannot find a temp directory by
checking environment variables, it will fall back
to using the current working directory as the temp
directory root.

This is what the test used to do as of commit
6de51caed5
and what was then changed by commit
792d098769
2017-12-07 15:31:49 +01:00
Laszlo Csomor
57a01c7fbe io_win32: add more encoding-related tests 2017-12-07 15:31:49 +01:00
Laszlo Csomor
65da9fd97f io_win32: support non-ASCII paths
Fixes https://github.com/google/protobuf/issues/3951
2017-12-07 15:31:49 +01:00
Laszlo Csomor
953a0253fc io_win32_unittest: make //:win32_test run again
Do not use "googletest.h", apprently that leads to
linking errors on Windows which I couldn't figure
out how to solve, and decided to just go with
plain gTest instead.

See https://github.com/google/protobuf/issues/3951
2017-12-07 15:31:49 +01:00
Bo Yang
457f6a607c Add release log 2017-12-06 10:54:11 -08:00
Bo Yang
ba60b854b6 Update php c extension version number to 3.5.0.1 2017-12-06 10:46:57 -08:00
Bo Yang
212563d756 Fix memory leak in php7 2017-12-06 10:40:07 -08:00
Bo Yang
3b7a5f4515 Fix several more memory leak 2017-12-06 10:38:18 -08:00
Bo Yang
7d3437152a Fix memory leak when creating map field via array. 2017-12-06 10:37:53 -08:00
Bo Yang
e0d3aa057b Fix memory leak when creating repeated field via array. 2017-12-06 10:37:26 -08:00
Paul Yang
de44982a74 Remove duplicate typedef. (#3975) 2017-12-06 10:36:52 -08: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
Bo Yang
b140cb3145 Fix memory leak when creating map field via array. 2017-12-04 12:32:10 -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
Bo Yang
1acacf46cc Fix memory leak when creating repeated field via array. 2017-12-01 20:14:57 -08: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