aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Uses head version of rvm to avoid shell_update_session not found error (#1791)3.0.0-beta-4Sergio Campamá2016-07-191-0/+4
| | | | | Uses head version of rvm to avoid shell_update_session not found error Fixes #1786
* Merge pull request #1808 from jcanizales/3.0.0-beta-4Paul Yang2016-07-192-2/+2
|\ | | | | Cherrypick: Use public methods to fetch oneofs in generated code.
| * Use public methods to fetch oneofs in generated code.Thomas Van Lenten2016-07-192-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
* 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 #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
| * Modify csharp README since there are now two NuGet packagesLuke Bakken2016-06-221-2/+2
| |
* | Merge pull request #1764 from jskeet/remove-is-value-typeJon Skeet2016-07-093-35/+6
|\ \ | | | | | | Remove unnecessary reflection call
| * | Remove unnecessary reflection callJon Skeet2016-07-083-35/+6
| | | | | | | | | | | | | | | 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_profilesThomas Van Lenten2016-07-082-83/+0
|\ \ \ | |/ / |/| | Drop the performace baselines.
| * | Drop the performace baselines.Thomas Van Lenten2016-07-082-83/+0
|/ / | | | | | | | | We weren't really using them, and the nested path causes checkout problems on windows.
* | Merge pull request #1757 from thomasvl/avoid_importing_srcThomas Van Lenten2016-07-076-14/+17
|\ \ | | | | | | Don't #import the .m files.
| * | Don't #import the .m files.Thomas Van Lenten2016-07-076-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | As bazel folks are looking at getting auto generation of module maps going and the importing of sources files causes issues there. We were only do it to hack around some of the apple linker behaviors around objc classes and categories, but even that isn't complete and CocoaPods was already doing -ObjC, and developers not using pods could have still needed it to ensure everything was linked anyways; so drop the hack of importing sources.
* | | Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0733-285/+2601
|\ \ \ | | | | | | | | Change placement of DebuggerNonUserCodeAttribute
| * | | Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | This does not affect the generated code. If we decide we want to apply attributes to generated types, we should start by just reverting this change.
| * | | Changes to generated code from previous commitJon Skeet2016-07-0420-244/+2537
| | | |
| * | | Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this has caught everything. I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything. Follow-up commit will include the changes to generated code itself. Fixes #1671.
* | | | Merge pull request #1758 from dago/pathmax2Feng Xiao2016-07-071-2/+0
|\ \ \ \ | | | | | | | | | | Make sure also Solaris x86 gets PATH_MAX
| * | | | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
|/ / / /
* | | | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \ \ \ | | | | | | | | | | Fix problems detected when integrating the code to our internal repo.
| * | | | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| | | | |
| * | | | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| | |/ / | |/| |
* | | | Merge pull request #1742 from ottok/fix-spellingFeng Xiao2016-07-0640-68/+68
|\ \ \ \ | | | | | | | | | | Fix spelling
| * | | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
| | | | |
| * | | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0339-67/+67
| | |/ / | |/| |
* | | | Merge pull request #1752 from acozzette/fix-js-testsAdam Cozzette2016-07-063-2/+486
|\ \ \ \ | |_|/ / |/| | | Fixed failing JS tests