aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | Merge pull request #4209 from acozzette/using-statementsGravatar Adam Cozzette2018-01-29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed using statements from common.h
| | * | | | | | | | Java: Generate warning free codeGravatar David Ostrovsky2018-01-27
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Partially fixes #4230.
| * | | | | | | | Removed using statements from common.hGravatar Adam Cozzette2018-01-26
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * | | Merge pull request #4236 from pherl/3.5.xGravatar Jisi Liu2018-01-26
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | Bumping number to fix ruby 2.1 on mac
| | | | | | * | | Bumping number to fix ruby 2.1 on macGravatar Jisi Liu2018-01-26
| | | | | | | | |
* | | | | | | | | Merge pull request #4229 from leighmcculloch/patch-1Gravatar Feng Xiao2018-01-26
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Remove broken link to code.google.com/p/protorpc
| * | | | | | | | Remove broken link to code.google.com/p/protorpcGravatar Leigh McCulloch2018-01-25
|/ / / / / / / / | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #3934 from xfxyjwf/builtsourcesGravatar Feng Xiao2018-01-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove the use of BUILT_SOURCES
* | | | | | | | | Update .NET SDK to 2.0.3Gravatar Jon Skeet2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * | | | Fix more memory leak for php c extension (#4211)Gravatar Paul Yang2018-01-25
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5
* | | | | | | | Merge pull request #4226 from themattchan/patch-1Gravatar Feng Xiao2018-01-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Haskell implementations
* | | | | | | | | Add an explicit import of stdatomic.h.Gravatar Thomas Van Lenten2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Bring back import of OSAtomic.Gravatar Thomas Van Lenten2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Add Haskell implementationsGravatar Matt Chan2018-01-24
|/ / / / / / / / | | | | | | | | | | | | | | | | Add Awake Security's Haskell Protobuf and GRPC implementations
* | | | | | | | Merge pull request #4224 from davido/drop_java_6_supportGravatar Feng Xiao2018-01-24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Drop java 6 support
| * | | | | | | | Drop java 6 supportGravatar David Ostrovsky2018-01-25
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4220.
| * / / / / / / Remove the use of BUILT_SOURCESGravatar Feng Xiao2018-01-24
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
| | * / / / / Create std::string in Arena memoryGravatar Ludger Sprenker2018-01-24
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4205 from xuwei-k/patch-2Gravatar Feng Xiao2018-01-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo in FieldMaskTree.java comment
* | | | | | | Migrate away from deprecated OSAtomic APIs. (#4184)Gravatar Jonathan Dierksen2018-01-22
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | * Migrate away from deprecated OSAtomic APIs.
| * | | | | fix typo in FieldMaskTree.java commentGravatar kenji yoshida2018-01-22
|/ / / / /
| * / / / cmake: privately add sources to targetsGravatar Ben Boeckel2018-01-19
|/ / / / | | | | | | | | | | | | | | | | Public sources get added to dependencies of the target as well which can cause duplicate symbols.
| | * | Merge pull request #4185 from pherl/ruby2.5Gravatar Jisi Liu2018-01-17
| | |\ \ | | | | | | | | | | Update rake file to build of 2.1.6.
| | | * | Update rake file to build of 2.1.6.Gravatar Jisi Liu2018-01-17
| | | | |
| | | | * Add support for libc++ on Windows.Gravatar Peter Collingbourne2018-01-17
| |_|_|/ |/| | | | | | | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
| | * | Merge pull request #4182 from pherl/ruby2.5Gravatar Jisi Liu2018-01-17
| | |\| | | | | | | | | Support ruby2.5
| | | * Support ruby2.5Gravatar Jisi Liu2018-01-17
| | | |
* | | | Add DiscardUnknownFields support for C#Gravatar Jon Skeet2018-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, unknown fields are preserved when parsing. To discard them, use a parser configured to do so: var parser = MyMessage.Parser.WithDiscardUnknownFields(true);
* | | | Merge pull request #4158 from BSBandme/FixBenchmarksGravatar Yilun Chong2018-01-10
|\ \ \ \ | | | | | | | | | | Fix java benchmark to use parser, fix cpp benchmark new arena to use …
| * | | | Update py_benchmark.pyGravatar Yilun Chong2018-01-10
| | | | |
| * | | | Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, ↵Gravatar Yilun Chong2018-01-09
|/ / / / | | | | | | | | | | | | format some files
* | | | Merge pull request #4148 from datacompboy/patch-2Gravatar Adam Cozzette2018-01-08
|\ \ \ \ | | | | | | | | | | Add more tests to time_test
* \ \ \ \ Merge pull request #4147 from datacompboy/patch-1Gravatar Adam Cozzette2018-01-08
|\ \ \ \ \ | | | | | | | | | | | | Fix ValidateDateTime: check day instead month
* \ \ \ \ \ Merge pull request #4132 from BSBandme/JavaCaliperCounterGravatar Yilun Chong2018-01-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Java caliper counter
| * | | | | | Add counter to Java benchmarkGravatar Yilun Chong2018-01-05
| | | | | | |
* | | | | | | Merge pull request #4065 from BSBandme/python_benchmark_realGravatar Yilun Chong2018-01-05
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add python benchmark
| | | | * | | | Update time_test.ccGravatar Anton Fedorov2018-01-05
| |_|_|/ / / / |/| | | | | | | | | | | | | Better test coverage for datetime validation.
| | | * | | | Fix ValidateDateTime: check day instead monthGravatar Anton Fedorov2018-01-05
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
| | | | * | Well known types are not initialized properly. (#4139)Gravatar Paul Yang2018-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Add python benchmarkGravatar Yilun Chong2018-01-05
| |/ / / /
| | | * | Merge pull request #4146 from pherl/fix_protocGravatar Jisi Liu2018-01-05
| | | |\ \ | | | | | | | | | | | | Bump protoc-artifact version for a patch rebuild
| | | | * | Bump protoc-artifact version for a patch rebuildGravatar Jisi Liu2018-01-05
| | | | |/
* | | | | Merge pull request #4131 from pherl/mergeGravatar Jisi Liu2018-01-04
|\ \ \ \ \ | | | | | | | | | | | | Merge 3.5.x branch into master
* \ \ \ \ \ Merge pull request #4116 from amandeepgautam/masterGravatar Adam Cozzette2018-01-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | whitelisting aix platform as it has sched_yield
| * | | | | | whitelisting aix platform as it has sched_yieldGravatar Amandeep Gautam2018-01-03
| | | | | | |
* | | | | | | Force a copy when saving the NSData that came from another.Gravatar Thomas Van Lenten2018-01-03
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #4014 from BSBandme/JavaCaliperGravatar Yilun Chong2018-01-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add caliper supported to java benchmark
| | | * \ \ \ Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
| | |/| | | |
| | | | * | | Merge pull request #4124 from pherl/nullptrGravatar Jisi Liu2018-01-03
| | | | |\ \ \ | | | | | | | | | | | | | | | | remove nullptr