aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | | | Updated failure_list_java.txt to remove tests that now passAdam Cozzette2016-06-301-2/+0
| | | |
* | | | Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette2016-06-301-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 GoogleAdam Cozzette2016-06-29216-5406/+13676
|/ / / | | | | | | | | | This includes all internal changes from around May 20 to now.
* | | Validate the tag numbers when parsing. (#1725)Thomas Van Lenten2016-06-295-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a twist code path (that some times showed up due to what happened to be in memory in failure cases), that would cast a bogus wire type into the enum, and then fall through switch statements. Resolve this by validating all wire types when parsing tags and throwing the error at that point so it can't enter the system. As added safety, stick in a few asserts for apis that get passed tags to ensure they also are only seeing valid data. Bonus: Tweak the parsing loop to skip some work when we get the end marker (zero tag) instead of still looping through all the fields.
* | | Merge pull request #1720 from thomasvl/issue_1716Thomas Van Lenten2016-06-283-22/+72
|\ \ \ | |/ / |/| | Fix GPBGetMessage{Repeated,Map}Field()
| * | Fix GPBGetMessage{Repeated,Map}Field()Thomas Van Lenten2016-06-273-22/+72
| | | | | | | | | | | | | | | | | | | | | - Correct impl by using helpers the message wiring does. - Add unittests. Fixes https://github.com/google/protobuf/issues/1716
* | | Adding conditional compiler symbol to support .NET 3.5 (#1713)detlevschwabe2016-06-287-5/+36
| | | | | | | | | | | | * Adding condition compiler symbol to support .NET 3.5
* | | Merge pull request #1719 from esteluk/patch-1Thomas Van Lenten2016-06-271-1/+1
|\ \ \ | |/ / |/| | Fix Objective-C generator option readme typo
| * | Fix Objective-C generator option typoNathan Wong2016-06-271-1/+1
|/ / | | | | Looks like this was changed during #1683, but missed in the README :)
* | Merge pull request #1714 from dnkoutso/masterThomas Van Lenten2016-06-263-0/+26
|\ \ | | | | | | Get value from text format name in GPBEnumDescriptor
| * | Get value from text format name in GPBEnumDescriptorDimitris Koutsogiorgas2016-06-263-0/+26
| | |
* | | Merge pull request #1705 from haberman/revjsverJoshua Haberman2016-06-231-7/+9
|\ \ \ | | | | | | | | Updates to package.json: rev version, add WKT, and recateogrize dependencies
| * | | JS package.json: Added author and updated Closure Library version.Josh Haberman2016-06-231-3/+5
| | | |
| * | | Moved all dependencies to devDependencies.Josh Haberman2016-06-221-6/+5
| | | | | | | | | | | | | | | | | | | | The runtime doesn't depend on anything, so these packages should always have been in devDependencies.
| * | | Add "google" to package.json "files" for WKT.Josh Haberman2016-06-221-0/+1
| | | |
| * | | Create patch release for JS to include WKT.Josh Haberman2016-06-221-1/+1
| | |/ | |/|
* | | Merge pull request #1707 from jskeet/format-valueJan Tattermusch2016-06-232-25/+58
|\ \ \ | |/ / |/| | Expose JsonFormatter.WriteValue.
| * | Expose JsonFormatter.WriteValue.Jon Skeet2016-06-232-25/+58
|/ / | | | | | | | | This isn't useful to most users, but can be handy in advanced use cases, as requested in #1465.
* | Merge pull request #1700 from jskeet/orderingJon Skeet2016-06-211-3/+4
|\ \ | | | | | | Remove ordering guarantees in the MapField documentation
| * | Remove ordering guarantees in the MapField documentationJon Skeet2016-06-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | This doesn't currently change the ordering in the implementation, but allows us to do so in the future. We also need to change https://developers.google.com/protocol-buffers/docs/reference/csharp-generated#singular which states "Finally, unlike Dictionary<TKey, TValue>, MapField<TKey, TValue> preserves insertion order of entries." (We can just remove that sentence, I think.)
* | | Rename methods to avoid ObjC KVC collisions. (#1699)Thomas Van Lenten2016-06-2114-7325/+7448
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Breaking API change on the Dictionary classes. The numeric value classes were using "Value" in the naming, but this silently collided with the KVC category on NSObject; meaning KVC code could break up a keypath and call these selectors with the wrong types leading to crashes (even though the code all would compile cleanly). - Rename the methods to use the "type" instead of literal "Value". - Update all the impls and tests. - Enable the warning that will catch issues like this in the future. Fixes https://github.com/google/protobuf/issues/1616
* | Adds destination flag to xcodebuild to avoid possible flake errors (#1697)Sergio Campamá2016-06-201-1/+6
| | | | | | | | Adds destination flag to xcodebuild to avoid possible flake errors
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examplesFeng Xiao2016-06-172-15/+22
|\ \ | | | | | | CMake Fix up prerelease version handling
| * | Fix prerelease version matching to be more consistent with the find_package ↵Walter Gray2016-06-092-15/+22
| | | | | | | | | | | | arguments.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-30 02:43:42 +0000