aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* restore old behavior for toObjectGravatar Nikolai Vavilov2016-07-19
|
* nitsGravatar Nikolai Vavilov2016-07-19
|
* Make implicit defaults consistent with explicit defaultsGravatar Nikolai Vavilov2016-07-19
|
* Merge pull request #1802 from haberman/jsmapbinGravatar Joshua Haberman2016-07-18
|\ | | | | JavaScript: segregate references to binary functionality
| * Fix goog.require()/goog.provide() ordering.Gravatar Josh Haberman2016-07-18
| |
* | Merge pull request #1803 from xfxyjwf/javadocGravatar Feng Xiao2016-07-19
|\ \ | | | | | | Include javadoc/source in Java release packages.
| * | Include javadoc/source in Java release packages.Gravatar Feng Xiao2016-07-18
|/ / | | | | | | | | | | Also fixed javadoc errors. [ci skip]
| * JavaScript: move extension binary info to separate struct.Gravatar Josh Haberman2016-07-18
| |
* | Merge remote-tracking branch 'origin/3.0.0-beta-4'Gravatar Feng Xiao2016-07-18
|\ \
| | * JavaScript maps: move binary callbacks out of constructor.Gravatar Josh Haberman2016-07-18
| |/ |/| | | | | | | | | 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 #1792 from xfxyjwf/changelogGravatar Feng Xiao2016-07-18
| |\ | | | | | | Added 3.0.0-beta-4 changelog.
| | * Remove Java deterministic API.Gravatar Feng Xiao2016-07-18
| | | | | | | | | | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
* | | Merge pull request #1801 from thomasvl/oneof_framework_build_issuesGravatar Thomas Van Lenten2016-07-18
|\ \ \ | | | | | | | | Use public methods to fetch oneofs in generated code.
| * | | Use public methods to fetch oneofs in generated code.Gravatar Thomas Van Lenten2016-07-18
|/ / / | | | | | | | | | | | | | | | | | | | | | 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
| | * Mention Java lite in the changelog.Gravatar Feng Xiao2016-07-15
| | | | | | | | | | | | Change-Id: Ic07a7c664930209974244c66885d672288982610
* | | Exposes the currently registered extensions for a message and removes the ↵Gravatar Sergio Campamá2016-07-15
| | | | | | | | | | | | internal sortedExtensionsInUse
* | | Uses head version of rvm to avoid shell_update_session not found error (#1791)Gravatar Sergio Campamá2016-07-15
| | | | | | | | | | | | | | | Uses head version of rvm to avoid shell_update_session not found error Fixes #1786
| | * Added 3.0.0-beta-4 changelog.Gravatar Feng Xiao2016-07-15
| |/ | | | | | | Change-Id: I997012e7e9b58d9ec8b2f59429d71c98d81aa40d
| * Merge pull request #1787 from xfxyjwf/steppingstoneGravatar Feng Xiao2016-07-15
| |\ | | | | | | Fix compatibility issues for the future GeneratedMessageV3 change.
| | * Fix compatiblity issues.Gravatar Feng Xiao2016-07-14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar Feng Xiao2016-07-14
| |
| * Merge pull request #1785 from jskeet/merge-csharpGravatar Jon Skeet2016-07-14
| |\ | | | | | | Merge C# changes from master to 3.0.0-beta4
| | * Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | | | | | | | platform (#1727) This also updates the version number to 3.0.0-beta4
| | * Remove the overload for Add(RepeatedField<T>)Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | | | | | | | | | | 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 ICollectionGravatar Jon Skeet2016-07-14
| | | | | | | | | | | | (Also fix a few more C# 6-isms.)
| | * Implement RepeatedField.AddRange.Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | This fixes issue #1730.
| | * Improve exception throwing implementation in collectionsGravatar Jon Skeet2016-07-14
| |/
* | Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Gravatar Jon Skeet2016-07-14
| | | | | | | | | | | | | | 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
| * Merge pull request #1781 from xfxyjwf/update_versionGravatar Feng Xiao2016-07-14
| |\ | | | | | | Update version number to 3.0.0-beta-4
| | * Update version number in AssemblyInfo.cs.Gravatar Feng Xiao2016-07-14
| | |
| * | Merge pull request #1783 from xfxyjwf/fixliteGravatar Jisi Liu2016-07-14
| |\ \ | | | | | | | | Comment out lite conformance test.
| | * | Exclude Java lite module from parent pom.xmlGravatar Feng Xiao2016-07-13
| | | |
| | * | Comment out lite conformance test.Gravatar Feng Xiao2016-07-13
| |/ / | | | | | | | | | The 'lite' generator flag is no longer supported.
| | * Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
| |/
| * Add missing LIBPROTOBUF_EXPORTGravatar Feng Xiao2016-07-13
| |
| * Add missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-07-13
| |
| * Update generated files.Gravatar Feng Xiao2016-07-13
| |
| * Integrate from internal code base.Gravatar Feng Xiao2016-07-13
| |
* | Implement RepeatedField.AddRange (#1733)Gravatar Jon Skeet2016-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-versionGravatar Feng Xiao2016-07-12
|\ \ | |/ |/| Fix a <package>_FIND_VERSION_PRERELEASE being ignored
| * Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to ↵Gravatar Walter Gray2016-07-12
|/ | | | be ignored.
* Merge pull request #1776 from thomasvl/fix_distGravatar Thomas Van Lenten2016-07-12
|\ | | | | Remove the baseline files from the make dist file list.
| * Remove the baseline files from the make dist file list.Gravatar Thomas Van Lenten2016-07-12
|/ | | | | 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)Gravatar Jos Hickson2016-07-10
|
* Merge pull request #1702 from lukebakken/csharp-nuget-doc-updateGravatar Jon Skeet2016-07-10
|\ | | | | Modify csharp README since there are now two NuGet packages
* \ Merge pull request #1764 from jskeet/remove-is-value-typeGravatar Jon Skeet2016-07-09
|\ \ | | | | | | Remove unnecessary reflection call
| * | Remove unnecessary reflection callGravatar Jon Skeet2016-07-08
| | | | | | | | | | | | | | | This is the only call to TypeExtensions.IsValueType, so we can remove that method, making the whole type conditionally compiled out for .NET 3.5
* | | Merge pull request #1762 from thomasvl/drop_perf_profilesGravatar Thomas Van Lenten2016-07-08
|\ \ \ | |/ / |/| | Drop the performace baselines.
| * | Drop the performace baselines.Gravatar Thomas Van Lenten2016-07-08
|/ / | | | | | | | | We weren't really using them, and the nested path causes checkout problems on windows.
* | Merge pull request #1757 from thomasvl/avoid_importing_srcGravatar Thomas Van Lenten2016-07-07
|\ \ | | | | | | Don't #import the .m files.