aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4196 from mathstuf/cmake-private-target-sourcesAdam Cozzette2018-01-291-1/+1
|\ | | | | cmake: privately add sources to targets
| * cmake: privately add sources to targetsBen Boeckel2018-01-191-1/+1
| | | | | | | | | | Public sources get added to dependencies of the target as well which can cause duplicate symbols.
* | Merge pull request #4240 from davido/generate_warning_free_java_codeFeng Xiao2018-01-292-0/+30
|\ \ | | | | | | Java: Generate warning free code
| * | Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
| | | | | | | | | | | | Partially fixes #4230.
* | | Merge pull request #4209 from acozzette/using-statementsAdam Cozzette2018-01-2938-151/+146
|\ \ \ | |/ / |/| | Removed using statements from common.h
| * | Removed using statements from common.hAdam Cozzette2018-01-2638-151/+146
|/ / | | | | | | | | | | 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 #4229 from leighmcculloch/patch-1Feng Xiao2018-01-261-1/+0
|\ \ | | | | | | Remove broken link to code.google.com/p/protorpc
| * | Remove broken link to code.google.com/p/protorpcLeigh McCulloch2018-01-251-1/+0
|/ / | | | | 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/builtsourcesFeng Xiao2018-01-251-4/+4
|\ \ | | | | | | Remove the use of BUILT_SOURCES
| * | Remove the use of BUILT_SOURCESFeng Xiao2018-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
* | | Update .NET SDK to 2.0.3Jon Skeet2018-01-253-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #4226 from themattchan/patch-1Feng Xiao2018-01-251-0/+2
|\ \ \ | | | | | | | | Add Haskell implementations
| * | | Add Haskell implementationsMatt Chan2018-01-241-0/+2
| | | | | | | | | | | | Add Awake Security's Haskell Protobuf and GRPC implementations
* | | | Add an explicit import of stdatomic.h.Thomas Van Lenten2018-01-254-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Thomas Van Lenten2018-01-251-0/+6
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #4224 from davido/drop_java_6_supportFeng Xiao2018-01-242-4/+4
|\ \ \ | |/ / |/| | Drop java 6 support
| * | Drop java 6 supportDavid Ostrovsky2018-01-252-4/+4
|/ / | | | | | | Fixes #4220.
* | Merge pull request #4205 from xuwei-k/patch-2Feng Xiao2018-01-231-1/+1
|\ \ | | | | | | fix typo in FieldMaskTree.java comment
| * | fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
| |/
* / Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-226-16/+20
|/ | | | * Migrate away from deprecated OSAtomic APIs.
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-155-56/+173
| | | | | | | 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/FixBenchmarksYilun Chong2018-01-106-62/+60
|\ | | | | Fix java benchmark to use parser, fix cpp benchmark new arena to use …
| * Update py_benchmark.pyYilun Chong2018-01-101-1/+1
| |
| * Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, ↵Yilun Chong2018-01-096-61/+59
|/ | | | format some files
* Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ | | | | Add more tests to time_test
| * Update time_test.ccAnton Fedorov2018-01-051-0/+53
| | | | | | Better test coverage for datetime validation.
* | Merge pull request #4147 from datacompboy/patch-1Adam Cozzette2018-01-081-2/+2
|\ \ | | | | | | Fix ValidateDateTime: check day instead month
| * | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
| |/ | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
* | Merge pull request #4132 from BSBandme/JavaCaliperCounterYilun Chong2018-01-052-12/+64
|\ \ | | | | | | Java caliper counter
| * | Add counter to Java benchmarkYilun Chong2018-01-052-12/+64
| | |
* | | Merge pull request #4065 from BSBandme/python_benchmark_realYilun Chong2018-01-055-8/+284
|\ \ \ | |_|/ |/| | Add python benchmark
| * | Add python benchmarkYilun Chong2018-01-055-8/+284
| |/
* | Merge pull request #4131 from pherl/mergeJisi Liu2018-01-0455-218/+853
|\ \ | | | | | | Merge 3.5.x branch into master
| * \ Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-032-7/+4
| |\ \
| | * \ Merge pull request #4124 from pherl/nullptrJisi Liu2018-01-031-1/+1
| | |\ \ | | | | | | | | | | remove nullptr
| | | * | remove nullptrJisi Liu2018-01-021-1/+1
| | | | |
| | * | | Merge pull request #4090 from pherl/nopasswordJisi Liu2018-01-031-6/+3
| | |\ \ \ | | | |/ / | | |/| | Fix uploading binary wheel.
| | | * | Fix uploading binary wheel.Jisi Liu2017-12-221-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The script now takes two prompt for user name and password. One single input redirection no longer works.
| * | | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0354-212/+850
| |\| | |
| | * | | Merge pull request #4089 from pherl/nocacheJisi Liu2017-12-221-1/+2
| | |\| | | | | | | | | | | | Disable pip cache when testing uploaded packages
| | | * | Disable pip cache when testing uploaded packagesJisi Liu2017-12-221-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, pip complains "cannot find a version satisfies the requirement." I suspect it was due to caching issues. I usued to manually add a `sleep 30` between the upload and the installation test which is quite unstable.
| | * | Merge pull request #4073 from pherl/changelogv3.5.1Jisi Liu2017-12-201-0/+31
| | |\ \ | | | | | | | | | | Update changelog for 3.5.1
| | | * | Update changelogJisi Liu2017-12-201-1/+1
| | | | |
| | | * | Update changelogJisi Liu2017-12-191-2/+7
| | | | |
| | | * | Merge branch '3.5.x' of github.com:google/protobuf into changelogJisi Liu2017-12-1926-28/+28
| | | |\ \
| | | * | | Update changelog for 3.5.1Jisi Liu2017-12-191-0/+26
| | | | | |
| | * | | | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| | |\ \ \ \ | | | | | | | | | | | | | | Add support for Windows ARM64 build
| | | * | | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-1955-769/+4529
| | |\ \ \ \ | | | | | | | | | | | | | | Cherrypick for csharp, including:
| | | * | | | Cherrypick for csharp, including:Jie Luo2017-12-1955-769/+4529
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 04:39:20 +0000