Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix typo in LazyField javadoc | Dave Hughes | 2015-11-24 | 1 | -2/+2 |
| | | | "equals".equals("euqals") == false | ||||
* | Merge pull request #1005 from oon3m0oo/emscripten | Feng Xiao | 2015-11-24 | 2 | -1/+5 |
|\ | | | | | Adds support for building protobuf with emscripten | ||||
| * | Adds support for buliding protobuf with emscripten; we just needed the ↵ | Craig Donner | 2015-11-24 | 2 | -1/+5 |
|/ | | | | proper platform define used in the right place. | ||||
* | Merge pull request #1003 from sainaetr/patch-1 | Thomas Van Lenten | 2015-11-23 | 1 | -0/+1 |
|\ | | | | | Update GPBProtocolBuffers.h | ||||
| * | Update GPBProtocolBuffers.h | Osman Cihangir | 2015-11-24 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1001 from thomasvl/fix_last_objc_conformance_tests | Thomas Van Lenten | 2015-11-23 | 2 | -7/+2 |
|\ | | | | | Set the stream limit to the length of the data. | ||||
| * | Set the stream limit to the length of the data. | Thomas Van Lenten | 2015-11-23 | 2 | -7/+2 |
|/ | | | | - Mark all conformance tests as now passing. | ||||
* | Merge pull request #980 from thomasvl/obj_conformance | Thomas Van Lenten | 2015-11-23 | 7 | -7/+245 |
|\ | | | | | Add support for the conformance test for objc when run on OS X | ||||
| * | Add support for the conformance test for objc when run on OS X | Thomas Van Lenten | 2015-11-18 | 7 | -7/+245 |
| | | |||||
* | | Merge pull request #990 from jskeet/naming | Jon Skeet | 2015-11-22 | 29 | -245/+208 |
|\ \ | | | | | | | Tidying up reflection further | ||||
| * | | Generated code changes for previous commit (basically ↵ | Jon Skeet | 2015-11-22 | 21 | -22/+22 |
| | | | | | | | | | | | | InternalBuildGeneratedFileFrom => FromGeneratedCode) | ||||
| * | | Tidy up reflection in advance of attempting to implement DynamicMessage. | Jon Skeet | 2015-11-22 | 10 | -225/+188 |
|/ / | | | | | | | | | | | | | | | | | There are corner cases where MessageDescriptor.{ClrType,Parser} will return null, and these are now documented. However, normally they *should* be implemented, even for descriptors of for dynamic messages. Ditto FieldDescriptor.Accessor. We'll still need a fair amount of work to implement dynamic messages, but this change means that the public API will be remain intact. Additionally, this change starts making use of C# 6 features in the files that it touches. This is far from exhaustive, and later PRs will have more. Generated code changes coming in the next commit. | ||||
* | | Merge pull request #994 from jskeet/type-registry | Jon Skeet | 2015-11-22 | 4 | -0/+279 |
|\ \ | | | | | | | Added the type registry in advance of implementing Any support. | ||||
| * | | Added the type registry in advance of implementing Any support. | Jon Skeet | 2015-11-21 | 4 | -0/+279 |
|/ / | | | | | | | Biting off just this bit first as I don't need the changes from a previous PR for this part. | ||||
* | | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-Fix | Jan Tattermusch | 2015-11-19 | 1 | -2/+5 |
|\ \ | | | | | | | Fixed a bug in CSharp SampleUsage. | ||||
| * | | Removed redundant comment. | Gabriel Kliot | 2015-11-19 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed a bug in CSharp SampleUsage. | Gabriel Kliot | 2015-11-18 | 1 | -1/+5 |
| |/ | |||||
* | | Merge pull request #989 from jskeet/rename-umbrella | Jan Tattermusch | 2015-11-19 | 10 | -42/+37 |
|\ \ | | | | | | | Rename "umbrella" to "reflection" consistently. | ||||
| * | | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 | 10 | -42/+37 |
| | | | | | | | | | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||||
* | | | Merge pull request #977 from lberki/master | Jisi Liu | 2015-11-19 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | add headers | ||||
| * | | add headers | Lukacs T. Berki | 2015-11-16 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #974 from jskeet/parser | Jon Skeet | 2015-11-19 | 25 | -122/+244 |
|\ \ \ | | | | | | | | | Parser property in MessageDescriptor | ||||
| * | | | Finished an implementation comment | Jon Skeet | 2015-11-19 | 1 | -1/+3 |
| | | | | |||||
| * | | | Generated code from previous commit. | Jon Skeet | 2015-11-19 | 20 | -105/+107 |
| | | | | |||||
| * | | | Introduce a Parser property into MessageDescriptor, and populate it from ↵ | Jon Skeet | 2015-11-19 | 5 | -17/+135 |
|/ / / | | | | | | | | | | | | | | | | generated types. Generated code coming in next commit - in a subsequent PR I want to do a bit of renaming and redocumenting around this, in anticipation of DynamicMessage. | ||||
* | | | Merge pull request #944 from jskeet/umbrella-classname | Jon Skeet | 2015-11-19 | 31 | -524/+454 |
|\ \ \ | |_|/ |/| | | Change the way the "umbrella class" (descriptors) is named/namespaced | ||||
| * | | Generated code changes and manual changes for previous commit. | Jon Skeet | 2015-11-09 | 28 | -468/+442 |
| | | | |||||
| * | | Change how the reflection descriptor class is generated. | Jon Skeet | 2015-11-09 | 3 | -56/+12 |
| | | | | | | | | | | | | | | | Instead of having a Proto nested namespace to avoid conflicts between the descriptor-holding static class and message classes, just append "Reflection" to the name. Generated code changes (and corresponding manual changes) in following commit. | ||||
* | | | Merge pull request #984 from thomasvl/prefix_validation_tweaks | Thomas Van Lenten | 2015-11-18 | 1 | -50/+51 |
|\ \ \ | | | | | | | | | Reorder the checks so anything in the expected file is an implicit whitelisting | ||||
| * | | | Reorder the checks so anything in the expected file is an implicit whitelisting. | Thomas Van Lenten | 2015-11-17 | 1 | -50/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | In the old flow, any 2 char prefix in the expected file was still generating a warning about being a poor prefix. Now we check the expected file first, so anything expected is let through. | ||||
* | | | | Merge pull request #982 from pherl/bazel_test | Jisi Liu | 2015-11-17 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Make the cc wkt proto target public. | ||||
| * | | | Make the cc wkt proto target public. | Jisi Liu | 2015-11-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #978 from thomasvl/conformance_tweaks | Joshua Haberman | 2015-11-17 | 3 | -4/+17 |
|\ \ \ \ | |_|_|/ |/| | | | Cleanups of deps and ignores for conformance | ||||
| * | | | Cleanups of deps and ignores for conformance | Thomas Van Lenten | 2015-11-16 | 3 | -4/+17 |
|/ / / | | | | | | | | | | | | | | | | - Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir. | ||||
* | | | Merge pull request #960 from thomasvl/xctool_support | Thomas Van Lenten | 2015-11-09 | 1 | -6/+43 |
|\ \ \ | | | | | | | | | Switch ObjC Travis testing to using xctool | ||||
| * | | | Switch ObjC Travis testing to using xctool | Thomas Van Lenten | 2015-11-09 | 1 | -6/+43 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | xctool is preinstalled on the Travis OS X images and it seems to do better with iOS simulator flake, so use it instead of xcodebuild. xctool also is less chatty compared to xcodebuild, so it makes the logs a little easier to read. | ||||
* | | | Merge pull request #959 from thomasvl/travis_mac2 | Thomas Van Lenten | 2015-11-09 | 2 | -1/+34 |
|\ \ \ | |_|/ |/| | | Add ObjC build to travis setup | ||||
| * | | Add ObjC build to travis setup | Thomas Van Lenten | 2015-11-09 | 2 | -1/+34 |
|/ / | | | | | | | | | - Add objc for iOS and OS X builds to travis configs. - Update handing of python install to deal with newer OS X versions. | ||||
* | | Merge pull request #954 from jskeet/blank-lines-in-comments | Jan Tattermusch | 2015-11-08 | 11 | -2/+133 |
|\ \ | | | | | | | Stop removing all blank lines in doc comments. | ||||
| * | | Generated code for previous commit. | Jon Skeet | 2015-11-06 | 10 | -0/+115 |
| | | | |||||
| * | | Stop removing all blank lines in doc comments. | Jon Skeet | 2015-11-06 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | | | | This fixes issue #832. Generated code changes in next commit. | ||||
* | | | Merge pull request #949 from thomasvl/newer_sims | Paul Yang | 2015-11-06 | 1 | -17/+51 |
|\ \ \ | |/ / |/| | | Tweaks to the Mac build script | ||||
| * | | Tweaks to the Mac build script | Thomas Van Lenten | 2015-11-05 | 1 | -17/+51 |
| | | | | | | | | | | | | | | | | | | - Support building with Xcode 6.4 or 7.x - Fix an error in usage info. - Add a flag to build the core parts of protobuf only. | ||||
* | | | Merge pull request #941 from jskeet/recursion-limit | Jan Tattermusch | 2015-11-05 | 6 | -15/+135 |
|\ \ \ | | | | | | | | | Add recursion limit handling to JSON parsing. | ||||
| * | | | Reimplement JSON recursion by detecting the depth in the tokenizer. | Jon Skeet | 2015-11-05 | 4 | -34/+124 |
| | | | | | | | | | | | | | | | | Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar. | ||||
| * | | | Add recursion limit handling to JSON parsing. | Jon Skeet | 2015-11-04 | 3 | -44/+74 |
| | | | | | | | | | | | | | | | | Fixes issue #932. | ||||
* | | | | Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime | Feng Xiao | 2015-11-05 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | include plugin.proto and generated code in protobuf-java | ||||
| * | | | include plugin.proto and generated code in protobuf-java | Joshua Humphries | 2015-11-05 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #940 from jskeet/json-names | Jon Skeet | 2015-11-05 | 2 | -6/+16 |
|\ \ \ | | | | | | | | | Move the creation of the "fields by JSON name" dictionary to the descriptor | ||||
| * | | | Move the creation of the "fields by JSON name" dictionary to the descriptor. | Jon Skeet | 2015-11-04 | 2 | -6/+16 |
| |/ / |