Commit Graph

5454 Commits

Author SHA1 Message Date
Adam Cozzette
1681fe664b
Merge pull request #4196 from mathstuf/cmake-private-target-sources
cmake: privately add sources to targets
2018-01-29 16:40:36 -08:00
Feng Xiao
f438ebd805
Merge pull request #4240 from davido/generate_warning_free_java_code
Java: Generate warning free code
2018-01-29 16:21:50 -08:00
Adam Cozzette
da6b07a2e5
Merge pull request #4209 from acozzette/using-statements
Removed using statements from common.h
2018-01-29 11:34:39 -08:00
David Ostrovsky
86fdad0fb5 Java: Generate warning free code
Partially fixes #4230.
2018-01-27 15:18:20 +01:00
Adam Cozzette
39a789e657 Removed using statements from common.h
These statements pulled a bunch of symbols from the std namespace into
the global namespace. This commit removes all of them except for
std::string, which is a bit trickier to remove.
2018-01-26 16:17:14 -08:00
Jisi Liu
91317c291e
Merge pull request #4236 from pherl/3.5.x
Bumping number to fix ruby 2.1 on mac
2018-01-26 15:34:53 -08:00
Jisi Liu
2a8e10257f Bumping number to fix ruby 2.1 on mac 2018-01-26 15:17:38 -08:00
Feng Xiao
c236896ec5
Merge pull request #4229 from leighmcculloch/patch-1
Remove broken link to code.google.com/p/protorpc
2018-01-26 11:11:40 -08:00
Leigh McCulloch
4a3b42ed05
Remove broken link to code.google.com/p/protorpc
Remove broken link to RPC implementation https://code.google.com/p/protorpc/. Going to this URL displays a 404 error message, with no indication that the project has a new location or still exists.
2018-01-25 22:27:19 -08:00
Feng Xiao
ed14fe423b
Merge pull request #3934 from xfxyjwf/builtsources
Remove the use of BUILT_SOURCES
2018-01-25 15:37:00 -08:00
Jon Skeet
0c52335587 Update .NET SDK to 2.0.3
This will allow SourceLink as per #4179, and mean that we can use C#
7.0 language features in the library (but not in generated code).
This does not affect which platforms we're *targeting*, so end users
won't see any difference.

It would be nice to update to 2.1.4, but AppVeyor's "Visual Studio
2017" environment is only 2.0.3.
2018-01-25 19:42:15 +00:00
Paul Yang
51293f36d8
Fix more memory leak for php c extension (#4211)
* Fix more memory leak for php c extension

* Fix memory leak for php5.5
2018-01-25 11:31:05 -08:00
Feng Xiao
94f3be06ba
Merge pull request #4226 from themattchan/patch-1
Add Haskell implementations
2018-01-25 10:49:33 -08:00
Thomas Van Lenten
3e1587fd4b Add an explicit import of stdatomic.h.
The generated code for enums needs atomics support, so generate the
import instead of relying on it via transitive imports. This will
make future changes to this likely likely to break generated code
and runtime support are mixed.

Followup to https://github.com/google/protobuf/pull/4184.
2018-01-25 12:18:39 -05:00
Thomas Van Lenten
6fd2ae7e45 Bring back import of OSAtomic.
Followup to https://github.com/google/protobuf/pull/4184, keep the
import to not break any existing generated code that isn't regenerated
when they update to the newer protobuf code.
2018-01-25 12:18:39 -05:00
Matt Chan
72337d6cc9
Add Haskell implementations
Add Awake Security's Haskell Protobuf and GRPC implementations
2018-01-24 23:52:04 -08:00
Feng Xiao
1d02e45468
Merge pull request #4224 from davido/drop_java_6_support
Drop java 6 support
2018-01-24 23:41:32 -08:00
David Ostrovsky
019ceea4b3 Drop java 6 support
Fixes #4220.
2018-01-25 06:54:38 +01:00
Feng Xiao
c337d9f929 Remove the use of BUILT_SOURCES
Fixes https://github.com/google/protobuf/issues/3912

[BUILT_SOURCES](https://www.gnu.org/software/automake/manual/html_node/Sources.html)
is used with [Automake's automatic dependency tracking](https://www.gnu.org/software/automake/manual/html_node/Dependencies.html#Dependencies)
but doesn't work well in protobuf when cross-compiling. Their presence
causes maek to always generate them even when they are not requested
and as a result causes cross-compilation to fail because the built protoc
cannot be used to generate unittest protos (see: https://github.com/google/protobuf/issues/3912).

Removing it with explicit dependencies fixes the build issue when running
'make', 'make all', 'make install' at cross-compilation. It doesn't affect
'make protoc' because BUILT_SOURCES only works for the implicit targets
'all', 'check' or 'install'.
2018-01-24 17:20:01 -08:00
Ludger Sprenker
9ab859f5a5
Create std::string in Arena memory 2018-01-24 17:14:05 +01:00
Feng Xiao
80e016e838
Merge pull request #4205 from xuwei-k/patch-2
fix typo in FieldMaskTree.java comment
2018-01-23 16:06:13 -08:00
Jonathan Dierksen
a721bf6d29 Migrate away from deprecated OSAtomic APIs. (#4184)
* Migrate away from deprecated OSAtomic APIs.
2018-01-22 16:26:39 -05:00
kenji yoshida
1c3b20b122
fix typo in FieldMaskTree.java comment 2018-01-22 00:09:36 +09:00
Ben Boeckel
9d0a44c9de cmake: privately add sources to targets
Public sources get added to dependencies of the target as well which can
cause duplicate symbols.
2018-01-19 12:05:00 -05:00
Jisi Liu
cbdeb6af3e
Merge pull request #4185 from pherl/ruby2.5
Update rake file to build of 2.1.6.
2018-01-17 17:16:05 -08:00
Jisi Liu
53d907f646 Update rake file to build of 2.1.6. 2018-01-17 17:01:32 -08:00
Peter Collingbourne
3ba21cd5f7 Add support for libc++ on Windows.
This disables a couple of workarounds which are only necessary with
MSVC's standard library and cause problems with libc++.
2018-01-17 16:05:49 -08:00
Jisi Liu
979c2cdbb5
Merge pull request #4182 from pherl/ruby2.5
Support ruby2.5
2018-01-17 15:42:43 -08:00
Jisi Liu
d9f0f0bfac Support ruby2.5 2018-01-17 15:00:46 -08:00
Jon Skeet
47b7d2c7ca Add DiscardUnknownFields support for C#
By default, unknown fields are preserved when parsing. To discard
them, use a parser configured to do so:

var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
2018-01-15 02:53:45 -05:00
Yilun Chong
9f80df0269
Merge pull request #4158 from BSBandme/FixBenchmarks
Fix java benchmark to use parser, fix cpp benchmark new arena to use …
2018-01-10 17:06:01 -08:00
Yilun Chong
473a810975
Update py_benchmark.py 2018-01-10 10:25:24 -08:00
Yilun Chong
fa60e550ec Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, format some files 2018-01-09 10:24:50 -08:00
Adam Cozzette
b77aa8011d
Merge pull request #4148 from datacompboy/patch-2
Add more tests to time_test
2018-01-08 10:41:54 -08:00
Adam Cozzette
d4afdba83d
Merge pull request #4147 from datacompboy/patch-1
Fix ValidateDateTime: check day instead month
2018-01-08 10:40:08 -08:00
Yilun Chong
bab843b8b9
Merge pull request #4132 from BSBandme/JavaCaliperCounter
Java caliper counter
2018-01-05 16:33:17 -08:00
Yilun Chong
195253c3f6 Add counter to Java benchmark 2018-01-05 16:28:51 -08:00
Yilun Chong
4adc5a48c0
Merge pull request #4065 from BSBandme/python_benchmark_real
Add python benchmark
2018-01-05 15:20:10 -08:00
Anton Fedorov
091eeb1261
Update time_test.cc
Better test coverage for datetime validation.
2018-01-05 22:12:00 +01:00
Anton Fedorov
473c5cff76
Fix ValidateDateTime: check day instead month
Found with PVS-Studio static analyser, see 
https://www.viva64.com/en/b/0550/
2018-01-05 22:09:44 +01:00
Paul Yang
3823897475
Well known types are not initialized properly. (#4139)
Previously, within the same load period of protobuf module, well known
types are not initialized correctly for the second request. The reason
is that well known type are only initialized if a method local static
variable is not set. However, that variable is not reset after request
ends. Therefore, when the second request comes, the method local static
variable is still set (by previous request) and well types are not
initialized in this case.
2018-01-05 13:05:07 -08:00
Yilun Chong
2fc69b1561 Add python benchmark 2018-01-05 11:20:40 -08:00
Jisi Liu
5aa8f98894
Merge pull request #4146 from pherl/fix_protoc
Bump protoc-artifact version for a patch rebuild
2018-01-05 10:28:10 -08:00
Jisi Liu
366192f3dc Bump protoc-artifact version for a patch rebuild 2018-01-05 10:10:38 -08:00
Jisi Liu
a3868af12b
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
2018-01-04 14:26:24 -08:00
Adam Cozzette
eca1d2a711
Merge pull request #4116 from amandeepgautam/master
whitelisting aix platform as it has sched_yield
2018-01-03 13:26:22 -08:00
Amandeep Gautam
0c0d481c69 whitelisting aix platform as it has sched_yield 2018-01-03 11:28:42 -08:00
Thomas Van Lenten
4588e6e2b9 Force a copy when saving the NSData that came from another. 2018-01-03 13:12:29 -05:00
Yilun Chong
43caa38d6e
Merge pull request #4014 from BSBandme/JavaCaliper
Add caliper supported to java benchmark
2018-01-03 09:42:26 -08:00
Jisi Liu
ec826c5a59 Merge remote-tracking branch 'origin/3.5.x' into master 2018-01-03 09:28:58 -08:00