aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP.jsbinsplitJosh Haberman2016-07-206-192/+201
|
* Merge pull request #1812 from jskeet/fix-travisJon Skeet2016-07-201-1/+1
|\ | | | | Use the dotnet-release package feed for Travis.
| * Use the dotnet-release package feed for Travis.Jon Skeet2016-07-191-1/+1
| | | | | | | | See https://github.com/dotnet/core/issues/227 for background.
* | Merge pull request #1447 from seishun/defaultsJoshua Haberman2016-07-204-73/+80
|\ \ | |/ |/| JavaScript: Make implicit defaults consistent with explicit defaults
| * fix debug.dumpNikolai Vavilov2016-07-201-2/+4
| |
| * restore old behavior for toObjectNikolai Vavilov2016-07-192-13/+37
| |
| * nitsNikolai Vavilov2016-07-191-32/+21
| |
| * Make implicit defaults consistent with explicit defaultsNikolai Vavilov2016-07-193-96/+88
|/
* Merge pull request #1802 from haberman/jsmapbinJoshua Haberman2016-07-184-131/+151
|\ | | | | JavaScript: segregate references to binary functionality
| * Fix goog.require()/goog.provide() ordering.Josh Haberman2016-07-182-2/+2
| |
| * JavaScript: move extension binary info to separate struct.Josh Haberman2016-07-183-38/+85
| |
| * JavaScript maps: move binary callbacks out of constructor.Josh Haberman2016-07-183-93/+66
| | | | | | | | | | | | This change will help us separate binary support into separate files, because we only refer to binary serialization functions in the actual binary serialization paths.
* | Merge pull request #1803 from xfxyjwf/javadocFeng Xiao2016-07-196-16/+42
|\ \ | | | | | | Include javadoc/source in Java release packages.
| * | Include javadoc/source in Java release packages.Feng Xiao2016-07-186-16/+42
|/ / | | | | | | | | | | Also fixed javadoc errors. [ci skip]
* | Merge remote-tracking branch 'origin/3.0.0-beta-4'Feng Xiao2016-07-1890-784/+1811
|\ \ | |/ |/|
| * Merge pull request #1792 from xfxyjwf/changelogv3.0.0-beta-4Feng Xiao2016-07-182-1/+82
| |\ | | | | | | Added 3.0.0-beta-4 changelog.
| | * Remove Java deterministic API.Feng Xiao2016-07-182-5/+2
| | | | | | | | | | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
| | * Mention Java lite in the changelog.Feng Xiao2016-07-151-0/+4
| | | | | | | | | | | | Change-Id: Ic07a7c664930209974244c66885d672288982610
| | * Added 3.0.0-beta-4 changelog.Feng Xiao2016-07-151-0/+80
| |/ | | | | | | Change-Id: I997012e7e9b58d9ec8b2f59429d71c98d81aa40d
| * Merge pull request #1787 from xfxyjwf/steppingstoneFeng Xiao2016-07-152-4/+72
| |\ | | | | | | Fix compatibility issues for the future GeneratedMessageV3 change.
| | * Fix compatiblity issues.Feng Xiao2016-07-142-4/+72
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some public API methods are defined in GenreatedMessage.java and they have a generric return type: class GeneratedMessage { class Builder<BuilderType extends Builder<BuilderType>> { public BuilderType setField(...); public BuilderType setExtension(...); } } With these definitions, the compiled byte code of a callsite will have a direct reference to GeneratedMessage. For example: fooBuilder.setField(...); becomes: ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder ##: checkcast // class Builder This will prevent us from updating generated classes to subclass a different versioned GeneratedMessageV3 class in the future (we can't do it in a binary compatible way). This change addresses the problem by overriding these methods directly in the generated class: class Foo { class Builder extends GeneratedMessage.Builder<Builder> { public Builder setField(...) { return super.setField(...); } } } After this, fooBuilder.setField(...) will be compiled to: ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder The callsites will no longer reference GeneratedMessage directly and we can change Foo to subclass GeneratedMessageV3 without breaking binary compatiblity. The downside of this change is: 1. It increases generated code size (though it saves some instructions on the callsites). 2. We can never stop generating these overrides because doing that will break binary compatibility. Change-Id: I879afbbc1325a66324a51565e017143489b06e97
| * Add missing golden test file.Feng Xiao2016-07-141-0/+1
| |
| * Merge pull request #1785 from jskeet/merge-csharpJon Skeet2016-07-1446-881/+538
| |\ | | | | | | Merge C# changes from master to 3.0.0-beta4
| | * Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Jon Skeet2016-07-1443-818/+367
| | | | | | | | | | | | | | | | | | platform (#1727) This also updates the version number to 3.0.0-beta4
| | * Remove the overload for Add(RepeatedField<T>)Jon Skeet2016-07-142-19/+23
| | | | | | | | | | | | | | | | | | | | | We now just perform the optimization within AddRange itself. This is a breaking change in terms of "drop in the DLL", but is source compatible, which should be fine.
| | * Optimize AddRange for sequences implementing ICollectionJon Skeet2016-07-142-8/+110
| | | | | | | | | | | | (Also fix a few more C# 6-isms.)
| | * Implement RepeatedField.AddRange.Jon Skeet2016-07-142-1/+23
| | | | | | | | | | | | This fixes issue #1730.
| | * Improve exception throwing implementation in collectionsJon Skeet2016-07-142-45/+25
| |/
| * Merge pull request #1781 from xfxyjwf/update_versionFeng Xiao2016-07-1415-17/+17
| |\ | | | | | | Update version number to 3.0.0-beta-4
| | * Update version number in AssemblyInfo.cs.Feng Xiao2016-07-141-1/+1
| | |
| | * Update version number to 3.0.0-beta-4Feng Xiao2016-07-1314-16/+16
| | |
| * | Merge pull request #1783 from xfxyjwf/fixliteJisi Liu2016-07-142-45/+45
| |\ \ | | |/ | |/| Comment out lite conformance test.
| | * Exclude Java lite module from parent pom.xmlFeng Xiao2016-07-131-1/+1
| | |
| | * Comment out lite conformance test.Feng Xiao2016-07-131-44/+44
| |/ | | | | | | The 'lite' generator flag is no longer supported.
| * Add missing LIBPROTOBUF_EXPORTFeng Xiao2016-07-131-4/+4
| |
| * Add missing LIBPROTOBUF_EXPORT.Feng Xiao2016-07-131-3/+4
| |
| * Update generated files.Feng Xiao2016-07-1313-259/+460
| |
| * Integrate from internal code base.Feng Xiao2016-07-1359-458/+1133
| |
* | Merge pull request #1801 from thomasvl/oneof_framework_build_issuesThomas Van Lenten2016-07-182-2/+2
|\ \ | | | | | | Use public methods to fetch oneofs in generated code.
| * | Use public methods to fetch oneofs in generated code.Thomas Van Lenten2016-07-182-2/+2
|/ / | | | | | | | | | | | | | | When building into frameworks, the generated code doesn't always have direct access to the proto internals. Instead of opening up the access, just use the public method to fetch the correct oneof. Fixes https://github.com/google/protobuf/issues/1789
* | Exposes the currently registered extensions for a message and removes the ↵Sergio Campamá2016-07-154-10/+5
| | | | | | | | internal sortedExtensionsInUse
* | Uses head version of rvm to avoid shell_update_session not found error (#1791)Sergio Campamá2016-07-151-0/+4
| | | | | | | | | | Uses head version of rvm to avoid shell_update_session not found error Fixes #1786
* | Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Jon Skeet2016-07-1443-818/+367
| | | | | | | | | | | | | | platform (#1727) Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform This also updates the version number to 3.0.0-beta4
* | Implement RepeatedField.AddRange (#1733)Jon Skeet2016-07-133-63/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve exception throwing implementation in collections * Implement RepeatedField.AddRange. This fixes issue #1730. * Optimize AddRange for sequences implementing ICollection (Also fix a few more C# 6-isms.) * Remove the overload for Add(RepeatedField<T>) We now just perform the optimization within AddRange itself. This is a breaking change in terms of "drop in the DLL", but is source compatible, which should be fine.
* | Merge pull request #1778 from yeswalrus/fix-prerelease-versionFeng Xiao2016-07-121-1/+1
|\ \ | |/ |/| Fix a <package>_FIND_VERSION_PRERELEASE being ignored
| * Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to ↵Walter Gray2016-07-121-1/+1
|/ | | | be ignored.
* Merge pull request #1776 from thomasvl/fix_distThomas Van Lenten2016-07-121-2/+0
|\ | | | | Remove the baseline files from the make dist file list.
| * Remove the baseline files from the make dist file list.Thomas Van Lenten2016-07-121-2/+0
|/ | | | | https://github.com/google/protobuf/pull/1762 remove the files, but I forgot to update Makefile.am to remove them.
* Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581)Jos Hickson2016-07-101-3/+1
|
* Merge pull request #1702 from lukebakken/csharp-nuget-doc-updateJon Skeet2016-07-101-2/+2
|\ | | | | Modify csharp README since there are now two NuGet packages
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 09:12:03 +0000