aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-046-17/+17
| | | | | | | Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type. Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code. Generated code changes in next commit.
* Merge pull request #1207 from jskeet/readmeJie Luo2016-02-031-16/+32
|\ | | | | Clarify readme for C#
| * Clarify readmeJon Skeet2016-02-031-16/+32
|/
* Merge pull request #1165 from damienmg/masterJisi Liu2016-02-021-6/+10
|\ | | | | Make protobuf Skylark extension appends the workspace root
| * Make protobuf Skylark extension appends the workspace rootDamien Martin-Guillerez2016-01-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This change make protobuf skylark extension works when using remote repository. Note that this make the Skylark extension unusable prior to Bazel 0.1.4 because the workspace_root is not available on prior version. Tested with Bazel 0.1.4rc2. Fixes https://github.com/bazelbuild/bazel/issues/784.
* | Merge pull request #1195 from calbach/python-json-structJie Luo2016-02-015-25/+659
|\ \ | | | | | | Manually down-integrate python JSON struct support from internal code base.
| * | Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-295-25/+659
| | |
* | | Merge pull request #1199 from google/google_integrateJisi Liu2016-02-0127-585/+2104
|\ \ \ | |/ / |/| | Integrate google internal changes to master
| * | Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
| | |
| * | Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
| | |
| * | Integrate from google internal.Jisi Liu2016-01-29157-825/+2317
| | | | | | | | | | | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
| * | Undo the Java module change for integration.Jisi Liu2016-01-28141-0/+0
|/ / | | | | | | | | | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
* | Merge pull request #1158 from jskeet/nonnormalized-tostringJan Tattermusch2016-01-2610-71/+378
|\ \ | | | | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
| * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throwJon Skeet2016-01-2010-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-buildFeng Xiao2016-01-221-6/+10
|\ \ \ | | | | | | | | Fix bazel BUILD for Java.
| * | | Fix bazel BUILD for Java.Ming Zhao2016-01-211-6/+10
| | | |
* | | | Merge pull request #1167 from xfxyjwf/refactor_docJisi Liu2016-01-222-186/+254
|\ \ \ \ | |/ / / |/| | | Refactor README.md.
| * | | Refactor README.md.Feng Xiao2016-01-212-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-jsonJan Tattermusch2016-01-211-2/+2
|\ \ \ | | | | | | | | Fix mistakes in highest-representable float64 integers
| * | | Fix mistakes in highest-representable float64 integersJon Skeet2016-01-211-2/+2
| | | |
* | | | Merge pull request #1162 from brian-peloton/masterFeng Xiao2016-01-211-2/+2
|\ \ \ \ | |/ / / |/| | | Avoid upcasting uninitialized pointers
| * | | Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-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_fixFeng Xiao2016-01-204-13/+13
|\ \ \ | |/ / |/| | Fixing compile errors on Solaris in 64-bit mode
| * | Fixing compile errors on Solaris in 64-bit modeMohamed El-Tahan2015-09-024-13/+13
| | |
* | | Merge pull request #1096 from jskeet/custom-to-stringJan Tattermusch2016-01-197-1/+142
|\ \ \ | | | | | | | | Introduce ICustomDiagnosticMessage to allow for custom string formatting
| * | | Introduce ICustomDiagnosticMessage to allow for custom string formattingJon Skeet2016-01-137-1/+142
| | | | | | | | | | | | | | | | This fixes issue #933, effectively.
* | | | Merge pull request #1155 from jcburke14/jb-intcastFeng Xiao2016-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix compiler warning from repeated_field.h
| * | | | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
|/ / / /
* | | | Merge pull request #1147 from jcanizales/patch-1Feng Xiao2016-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Update podspec version to 3.0.0-beta-2
| * | | | Update podspec version to 3.0.0-beta-2Jorge Canizales2016-01-151-1/+1
| | | | | | | | | | | | | | | It's already submitted.
* | | | | Merge pull request #896 from ↵Feng Xiao2016-01-166-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 Humphries2016-01-151-0/+0
| | | | | |
| * | | | | fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
| | | | | |
| * | | | | throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-156-14/+300
| |/ / / /
* | | | | Merge pull request #1145 from jskeet/conformanceJon Skeet2016-01-1617-233/+537
|\ \ \ \ \ | | | | | | | | | | | | JSON Conformance improvements
| * | | | | Fix broken testJon Skeet2016-01-151-1/+1
| | | | | |
| * | | | | Remove now-fixed conformance errors.Jon Skeet2016-01-151-73/+0
| | | | | |
| * | | | | Make sure thatJon Skeet2016-01-154-8/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "valueField": null is parsed appropriately, i.e. that it remembers that the field is set.
| * | | | | Reject JSON containing the same oneof field twiceJon Skeet2016-01-152-0/+22
| | | | | |
| * | | | | Change handling of unknown enums: we now write out the value as a number.Jon Skeet2016-01-154-36/+23
| | | | | |
| * | | | | Extra strictness for FieldMask conversionJon Skeet2016-01-154-2/+51
| | | | | |
| * | | | | Allow the original field name (rather than camel-cased) when parsing JSONJon Skeet2016-01-152-3/+23
| | | | | |
| * | | | | Fixes to JSON timestamp/duration representationsJon Skeet2016-01-158-35/+139
| | | | | |
| * | | | | Report serialization errors in conformance testsJon Skeet2016-01-151-8/+15
| | | | | |
| * | | | | Prohibit null values in repeated and map fields in JSONJon Skeet2016-01-152-1/+38
| | | | | |
| * | | | | Throw a better exception when invalid base64 is detected in JSONJon Skeet2016-01-153-1/+28
| | | | | |
| * | | | | Support (and test) numeric enum parsing in JSONJon Skeet2016-01-152-0/+29
| | | | | |
| * | | | | Fix handling of repeated wrappersJon Skeet2016-01-153-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 fixesJon Skeet2016-01-133-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/pycppfixJoshua Haberman2016-01-153-181/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed Python 3.x C++ build, and updated conformance failure lists.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 07:36:57 +0000