Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve exception throwing implementation in collections | Jon Skeet | 2016-07-14 | 2 | -45/+25 |
| | |||||
* | Merge pull request #1781 from xfxyjwf/update_version | Feng Xiao | 2016-07-14 | 15 | -17/+17 |
|\ | | | | | Update version number to 3.0.0-beta-4 | ||||
| * | Update version number in AssemblyInfo.cs. | Feng Xiao | 2016-07-14 | 1 | -1/+1 |
| | | |||||
| * | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 14 | -16/+16 |
| | | |||||
* | | Merge pull request #1783 from xfxyjwf/fixlite | Jisi Liu | 2016-07-14 | 2 | -45/+45 |
|\ \ | |/ |/| | Comment out lite conformance test. | ||||
| * | Exclude Java lite module from parent pom.xml | Feng Xiao | 2016-07-13 | 1 | -1/+1 |
| | | |||||
| * | Comment out lite conformance test. | Feng Xiao | 2016-07-13 | 1 | -44/+44 |
|/ | | | | The 'lite' generator flag is no longer supported. | ||||
* | Add missing LIBPROTOBUF_EXPORT | Feng Xiao | 2016-07-13 | 1 | -4/+4 |
| | |||||
* | Add missing LIBPROTOBUF_EXPORT. | Feng Xiao | 2016-07-13 | 1 | -3/+4 |
| | |||||
* | Update generated files. | Feng Xiao | 2016-07-13 | 13 | -259/+460 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 59 | -458/+1133 |
| | |||||
* | Merge pull request #1776 from thomasvl/fix_dist | Thomas Van Lenten | 2016-07-12 | 1 | -2/+0 |
|\ | | | | | Remove the baseline files from the make dist file list. | ||||
| * | Remove the baseline files from the make dist file list. | Thomas Van Lenten | 2016-07-12 | 1 | -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 Hickson | 2016-07-10 | 1 | -3/+1 |
| | |||||
* | Merge pull request #1702 from lukebakken/csharp-nuget-doc-update | Jon Skeet | 2016-07-10 | 1 | -2/+2 |
|\ | | | | | Modify csharp README since there are now two NuGet packages | ||||
| * | Modify csharp README since there are now two NuGet packages | Luke Bakken | 2016-06-22 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1764 from jskeet/remove-is-value-type | Jon Skeet | 2016-07-09 | 3 | -35/+6 |
|\ \ | | | | | | | Remove unnecessary reflection call | ||||
| * | | Remove unnecessary reflection call | Jon Skeet | 2016-07-08 | 3 | -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_profiles | Thomas Van Lenten | 2016-07-08 | 2 | -83/+0 |
|\ \ \ | |/ / |/| | | Drop the performace baselines. | ||||
| * | | Drop the performace baselines. | Thomas Van Lenten | 2016-07-08 | 2 | -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_src | Thomas Van Lenten | 2016-07-07 | 6 | -14/+17 |
|\ \ | | | | | | | Don't #import the .m files. | ||||
| * | | Don't #import the .m files. | Thomas Van Lenten | 2016-07-07 | 6 | -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-placement | Jon Skeet | 2016-07-07 | 33 | -285/+2601 |
|\ \ \ | | | | | | | | | Change placement of DebuggerNonUserCodeAttribute | ||||
| * | | | Remove WriteGeneratedTypeAttributes which is a no-op | Jon Skeet | 2016-07-07 | 5 | -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 commit | Jon Skeet | 2016-07-04 | 20 | -244/+2537 |
| | | | | |||||
| * | | | Move DebuggerNonUserCodeAttribute to function members | Jon Skeet | 2016-07-04 | 13 | -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/pathmax2 | Feng Xiao | 2016-07-07 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Make sure also Solaris x86 gets PATH_MAX | ||||
| * | | | | Make sure also Solaris x86 gets PATH_MAX | Dagobert Michelsen | 2016-07-07 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | Merge pull request #1753 from xfxyjwf/fixup | Jisi Liu | 2016-07-07 | 2 | -10/+2 |
|\ \ \ \ | | | | | | | | | | | Fix problems detected when integrating the code to our internal repo. | ||||
| * | | | | Fix data member declaration order. | Feng Xiao | 2016-07-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Don't support global ::string in stringpiece.h | Feng Xiao | 2016-07-06 | 1 | -8/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1742 from ottok/fix-spelling | Feng Xiao | 2016-07-06 | 40 | -68/+68 |
|\ \ \ \ | | | | | | | | | | | Fix spelling | ||||
| * | | | | Fix spelling error in function ParseTime parameter | Otto Kekäläinen | 2016-07-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 39 | -67/+67 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1752 from acozzette/fix-js-tests | Adam Cozzette | 2016-07-06 | 3 | -2/+486 |
|\ \ \ \ | |_|/ / |/| | | | Fixed failing JS tests | ||||
| * | | | Fixed failing JS tests | Adam Cozzette | 2016-07-06 | 3 | -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-handling | Thomas Van Lenten | 2016-07-06 | 2 | -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 types | Dia Kharrat | 2016-07-05 | 2 | -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_options | Feng Xiao | 2016-07-01 | 8 | -32/+214 |
|\ \ \ | |/ / |/| | | Add JsonParseOptions to ignore unknown fields | ||||
| * | | Add JsonParseOptions to ignore unknown fields | Lizan Zhou | 2016-06-28 | 8 | -32/+214 |
| | | | | | | | | | | | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions | ||||
* | | | Merge pull request #1738 from xfxyjwf/fixbuild | Feng Xiao | 2016-07-01 | 4 | -4/+67 |
|\ \ \ | | | | | | | | | Fix some failing travis tests. | ||||
| * | | | Fix some failing travis tests. | Feng Xiao | 2016-07-01 | 4 | -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/master | Feng Xiao | 2016-07-01 | 2 | -26/+159 |
|\ \ \ | | | | | | | | | Add minified Json printing functionality | ||||
| * | | | added minified JSON formatting functionality with test | chezRong | 2016-07-01 | 2 | -26/+159 |
| | | | | |||||
* | | | | Merge pull request #1723 from thomasvl/objc_test_coverage | Thomas Van Lenten | 2016-07-01 | 6 | -43/+11 |
|\ \ \ \ | |/ / / |/| | | | Xcode project cleanup/setup. | ||||
| * | | | Xcode project cleanup/setup. | Thomas Van Lenten | 2016-06-29 | 6 | -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 Xiao | 2016-06-30 | 2 | -7/+14 |
| | | | | | | | | | | | | | | | | Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef | ||||
* | | | | Updated failure_list_java.txt to remove tests that now pass | Adam Cozzette | 2016-06-30 | 1 | -2/+0 |
| | | | | |||||
* | | | | Fixed string formatting in text_format.py to be Python2.6-compatible | Adam Cozzette | 2016-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | In Python 2.6 the positional argument specifiers are apparently required to be explicitly specified: http://stackoverflow.com/questions/10054122/valueerror-zero-length-field-name-in-format-python | ||||
* | | | | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 216 | -5406/+13676 |
|/ / / | | | | | | | | | | This includes all internal changes from around May 20 to now. |