Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1158 from jskeet/nonnormalized-tostring | Jan Tattermusch | 2016-01-26 | 10 | -71/+378 |
|\ | | | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw | ||||
| * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw | Jon Skeet | 2016-01-20 | 10 | -71/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was intended to make it clearer that it *did* have a custom format... but then arguably I should do the same for Value, Struct, Any etc. Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but also domain-specific bits of computation. <sigh> Thoughts welcome. | ||||
* | | Merge pull request #1169 from LuminateWireless/bazel-build | Feng Xiao | 2016-01-22 | 1 | -6/+10 |
|\ \ | | | | | | | Fix bazel BUILD for Java. | ||||
| * | | Fix bazel BUILD for Java. | Ming Zhao | 2016-01-21 | 1 | -6/+10 |
| | | | |||||
* | | | Merge pull request #1167 from xfxyjwf/refactor_doc | Jisi Liu | 2016-01-22 | 2 | -186/+254 |
|\ \ \ | |/ / |/| | | Refactor README.md. | ||||
| * | | Refactor README.md. | Feng Xiao | 2016-01-21 | 2 | -186/+254 |
|/ / | | | | | | | | | | | Move the original README.md to src since it's talking about C++ exclusively and add a more general README.md to document how to install protoc for all languages. | ||||
* | | Merge pull request #1163 from jskeet/more-json | Jan Tattermusch | 2016-01-21 | 1 | -2/+2 |
|\ \ | | | | | | | Fix mistakes in highest-representable float64 integers | ||||
| * | | Fix mistakes in highest-representable float64 integers | Jon Skeet | 2016-01-21 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1162 from brian-peloton/master | Feng Xiao | 2016-01-21 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Avoid upcasting uninitialized pointers | ||||
| * | | Avoid upcasting uninitialized pointers | Brian Silverman | 2016-01-20 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | | | | | | | Fixes google/protobuf#693 msan flags this as being undefined behavior. I think it's triggering because the compiler has to insert a branch to avoid changing the pointer's value if it starts out NULL. I can't figure out if this is actually undefined behavior or not, but it definitely seems to be a gray area of the standard which is best avoided. | ||||
* | | Merge pull request #789 from motahan/solaris64_fix | Feng Xiao | 2016-01-20 | 4 | -13/+13 |
|\ \ | |/ |/| | Fixing compile errors on Solaris in 64-bit mode | ||||
| * | Fixing compile errors on Solaris in 64-bit mode | Mohamed El-Tahan | 2015-09-02 | 4 | -13/+13 |
| | | |||||
* | | Merge pull request #1096 from jskeet/custom-to-string | Jan Tattermusch | 2016-01-19 | 7 | -1/+142 |
|\ \ | | | | | | | Introduce ICustomDiagnosticMessage to allow for custom string formatting | ||||
| * | | Introduce ICustomDiagnosticMessage to allow for custom string formatting | Jon Skeet | 2016-01-13 | 7 | -1/+142 |
| | | | | | | | | | | | | This fixes issue #933, effectively. | ||||
* | | | Merge pull request #1155 from jcburke14/jb-intcast | Feng Xiao | 2016-01-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix compiler warning from repeated_field.h | ||||
| * | | | Fix compiler warning from repeated_field.h | John Burke | 2016-01-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1147 from jcanizales/patch-1 | Feng Xiao | 2016-01-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update podspec version to 3.0.0-beta-2 | ||||
| * | | | Update podspec version to 3.0.0-beta-2 | Jorge Canizales | 2016-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | It's already submitted. | ||||
* | | | | Merge pull request #896 from ↵ | Feng Xiao | 2016-01-16 | 6 | -14/+300 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | jhump/jh/fix-ioexception-vs-invalidprotobuf-exception throw IOException instead of InvalidProtocolBufferException when appropriate | ||||
| * | | | | move test file (was in wrong place after rebasing on java module refactor) | Joshua Humphries | 2016-01-15 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | fully qualify invocations of static methods on GeneratedMessage | Joshua Humphries | 2016-01-15 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 6 | -14/+300 |
| |/ / / | |||||
* | | | | Merge pull request #1145 from jskeet/conformance | Jon Skeet | 2016-01-16 | 17 | -233/+537 |
|\ \ \ \ | | | | | | | | | | | JSON Conformance improvements | ||||
| * | | | | Fix broken test | Jon Skeet | 2016-01-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove now-fixed conformance errors. | Jon Skeet | 2016-01-15 | 1 | -73/+0 |
| | | | | | |||||
| * | | | | Make sure that | Jon Skeet | 2016-01-15 | 4 | -8/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "valueField": null is parsed appropriately, i.e. that it remembers that the field is set. | ||||
| * | | | | Reject JSON containing the same oneof field twice | Jon Skeet | 2016-01-15 | 2 | -0/+22 |
| | | | | | |||||
| * | | | | Change handling of unknown enums: we now write out the value as a number. | Jon Skeet | 2016-01-15 | 4 | -36/+23 |
| | | | | | |||||
| * | | | | Extra strictness for FieldMask conversion | Jon Skeet | 2016-01-15 | 4 | -2/+51 |
| | | | | | |||||
| * | | | | Allow the original field name (rather than camel-cased) when parsing JSON | Jon Skeet | 2016-01-15 | 2 | -3/+23 |
| | | | | | |||||
| * | | | | Fixes to JSON timestamp/duration representations | Jon Skeet | 2016-01-15 | 8 | -35/+139 |
| | | | | | |||||
| * | | | | Report serialization errors in conformance tests | Jon Skeet | 2016-01-15 | 1 | -8/+15 |
| | | | | | |||||
| * | | | | Prohibit null values in repeated and map fields in JSON | Jon Skeet | 2016-01-15 | 2 | -1/+38 |
| | | | | | |||||
| * | | | | Throw a better exception when invalid base64 is detected in JSON | Jon Skeet | 2016-01-15 | 3 | -1/+28 |
| | | | | | |||||
| * | | | | Support (and test) numeric enum parsing in JSON | Jon Skeet | 2016-01-15 | 2 | -0/+29 |
| | | | | | |||||
| * | | | | Fix handling of repeated wrappers | Jon Skeet | 2016-01-15 | 3 | -77/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were incorrectly packing wrapper types. This also refactors FieldCodec a bit as well, using more C# 6-ness. | ||||
| * | | | | JSON conformance test fixes | Jon Skeet | 2016-01-13 | 3 | -0/+16 |
| | |/ / | |/| | | | | | | | | | | | | | | - Spot an Any without a type URL - In the conformance test runner, catch exceptions due to generally-invalid JSON | ||||
* | | | | Merge pull request #1146 from haberman/pycppfix | Joshua Haberman | 2016-01-15 | 3 | -181/+5 |
|\ \ \ \ | |_|/ / |/| | | | Fixed Python 3.x C++ build, and updated conformance failure lists. | ||||
| * | | | Fixed Python 3.x C++ build, and updated conformance failure lists. | Josh Haberman | 2016-01-15 | 3 | -181/+5 |
| | | | | |||||
* | | | | Merge pull request #1143 from xfxyjwf/fix_java | Feng Xiao | 2016-01-15 | 2 | -156/+158 |
|\ \ \ \ | |/ / / |/| | | | Fix tests broken by the Java directory change. | ||||
| * | | | Fix tests broken by the Java directory change. | Feng Xiao | 2016-01-14 | 2 | -156/+158 |
|/ / / | | | | | | | | | | Change-Id: I39c4eadbd28164cfd83aa2d1d8b6dfe8286db803 | ||||
* | | | Merge pull request #1121 from nmittler/restructure | Feng Xiao | 2016-01-13 | 146 | -432/+516 |
|\ \ \ | |/ / |/| | | Restructuring protobuf to multiple modules | ||||
| * | | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 146 | -432/+516 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings. | ||||
* | | | Merge pull request #1089 from jskeet/map-null | Jan Tattermusch | 2016-01-12 | 14 | -176/+168 |
|\ \ \ | | | | | | | | | Prohibit null values in maps | ||||
| * | | | Prohibit null values in map fields | Jon Skeet | 2016-01-11 | 14 | -176/+168 |
| | | | | | | | | | | | | | | | | | | | | On deserialization, missing values for message types are replaced with a "default" message. | ||||
* | | | | Merge pull request #1080 from haberman/conformance-crashes | Joshua Haberman | 2016-01-12 | 14 | -59/+861 |
|\ \ \ \ | | | | | | | | | | | Allow conformance test runner to tolerate crashes, and re-enable conformance tests | ||||
| * | | | | Don't generate Objective C WKT for conformance tests to avoid dupliate defs. | Josh Haberman | 2016-01-12 | 1 | -6/+11 |
| | | | | | |||||
| * | | | | Conformance: Update C# failure list to reflect which tests currently pass. | Josh Haberman | 2016-01-12 | 1 | -89/+2 |
| | | | | | |||||
| * | | | | Fixed Ruby conformance tests by running them under rvm Ruby. | Josh Haberman | 2016-01-11 | 3 | -5/+4 |
| | | | | | |||||
| * | | | | Added debugging output to debug type= problem on Travis. | Josh Haberman | 2016-01-11 | 2 | -2/+3 |
| | | | | |