aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Fixed failing JS testsAdam Cozzette2016-07-063-2/+486
| | | | | | | | | | | | | | | | | | | | | | | | A couple of small tweaks were needed to fix test failures that were inadvertently introduced in the last down integration. I also had to add the map.js file which was missing.
* | | | Merge pull request #1712 from dkharrat/swift-error-handlingThomas Van Lenten2016-07-062-21/+21
|\ \ \ \ | |_|/ / |/| | | add nullable qualifier to return types that can be nil, to support Swift 2 try-catch syntax
| * | | add nullable qualifier to nil return typesDia Kharrat2016-07-052-21/+21
|/ / / | | | | | | | | | | | | | | | Add the `nullable` qualifier to return types of Objective-C methods that can return a nil due to errors. This change makes these methods compatible with the Swift 2 try-catch syntax.
* | | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \ \ | |/ / |/| | Add JsonParseOptions to ignore unknown fields
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
| | | | | | | | | | | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* | | Merge pull request #1738 from xfxyjwf/fixbuildFeng Xiao2016-07-014-4/+67
|\ \ \ | | | | | | | | Fix some failing travis tests.
| * | | Fix some failing travis tests.Feng Xiao2016-07-014-4/+67
|/ / / | | | | | | | | | | | | | | | | | | 1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
* | | Merge pull request #1710 from chezRong/masterFeng Xiao2016-07-012-26/+159
|\ \ \ | | | | | | | | Add minified Json printing functionality
| * | | added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
| | | |
* | | | Merge pull request #1723 from thomasvl/objc_test_coverageThomas Van Lenten2016-07-016-43/+11
|\ \ \ \ | |/ / / |/| | | Xcode project cleanup/setup.
| * | | Xcode project cleanup/setup.Thomas Van Lenten2016-06-296-43/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Correct some cases sources were compiled into the static lib and the tests. - Enable Xcodes code coverage support on the unittests. We aren't complete on coverage, but having the data always there should make it easier to chip away at this going forward. - Drop method in tests that isn't used, wire up a validator in another test.
* | | | Fix windows build.Feng Xiao2016-06-302-7/+14
| | | | | | | | | | | | | | | | Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 03:22:38 +0000