aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix up warnings from Xcode 9.1 (#3887)dmaclach2017-11-1625-52/+78
| | | | Fix up warnings from Xcode 9.1
* Update README.md: C extension works on PHP 7 (#3888)Issac Trotts2017-11-151-1/+1
| | | Here's the pull request that made it happen: https://github.com/google/protobuf/pull/2951
* Merge pull request #3892 from sergiocampama/32bitThomas Van Lenten2017-11-151-1/+1
|\ | | | | Fixes 32bit tests.
| * Fixes 32bit tests.Sergio Campama2017-11-151-1/+1
| |
* | Merge pull request #3878 from Yangqing/masterFeng Xiao2017-11-152-12/+27
|\ \ | | | | | | Allow one to omit building libprotoc and protoc binaries
| * | Allow one to omit building libprotoc and protoc binariesYangqing Jia2017-11-132-12/+27
| | |
* | | Merge pull request #3891 from thomasvl/travis_cleanupsThomas Van Lenten2017-11-151-39/+8
|\ \ \ | |_|/ |/| | Travis cleanups
| * | Remove the allowed_failure for python_cpp as the bug was fixed.Thomas Van Lenten2017-11-151-4/+0
| | |
| * | Remove the ruby tests from travis configs.Thomas Van Lenten2017-11-151-8/+0
| | | | | | | | | | | | | | | | | | | | | Looking at tarvis history for master, jruby doesn't look like it has passed in a really long time. The other two tests have been failing for a few weeks. Since travis has limited osx hosts, seems better to just remove things we aren't expecting to pass.
| * | Update some comments about testing.Thomas Van Lenten2017-11-151-7/+4
| | |
| * | Instead of listing and then excluding osx builds, just don't list them.Thomas Van Lenten2017-11-151-20/+4
| | |
* | | Merge pull request #3883 from dmaclach/map_optimizationsThomas Van Lenten2017-11-1511-4987/+410
|\ \ \ | | | | | | | | Reduce size of GPBDictionary by getting rid of class creation methods
| * | | codereview cleanupDave MacLachlan2017-11-151-2/+2
| | | |
| * | | Reduce size of GPBDictionary by getting rid of class creation methodsDave MacLachlan2017-11-1411-4987/+410
| |/ /
* | | Merge pull request #3884 from dmaclach/unsafeThomas Van Lenten2017-11-151-4/+9
|\ \ \ | | | | | | | | Simplify getter/setter method implementations
| * | | code review cleanupDave MacLachlan2017-11-151-5/+5
| | | |
| * | | Simplify getter/setter method implementationsDave MacLachlan2017-11-141-3/+8
| |/ / | | | | | | | | | | | | | | | | | | Remove unnecessary retain/releases for GPBFieldDescriptors when creating implementations with blocks. The descriptors do not need to be memory managed because they are essentially global constructs that are guaranteed to be around the lifetime of the app.
* | | Merge pull request #3882 from dmaclach/removeclass2Thomas Van Lenten2017-11-153-11/+13
|\ \ \ | |/ / |/| | Remove unreferenced 'GPBMessageSignatureProtocol' class.
| * | Remove unreferenced 'GPBMessageSignatureProtocol' class.Dave MacLachlan2017-11-143-11/+13
|/ / | | | | | | | | | | | | | | | | Remove unreferenced 'GPBMessageSignatureProtocol' class that is just taking up space in the Objective C runtime information by hanging the protocol it needs to declare off of GPBRootObject instead. Small binary size reduction, but more importantly a removal of a class that appears to be unused when statically analyzed.
* / Remove non-C# options from C#-only test protosJon Skeet2017-11-1410-41/+13
|/
* Merge pull request #3834 from sviterok/patch-1Jisi Liu2017-11-131-1/+1
|\ | | | | Fix a typo in WKT's test suite
| * Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
| | | | | | | | | | | | | | Hi! Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite: `"accpets" -> "accepts"` Thanks!
* | Update README.mdJisi Liu2017-11-131-4/+7
| |
* | Merge pull request #3875 from hchasestevens/add-hypothesis-protobuf-docFeng Xiao2017-11-131-0/+1
|\ \ | | | | | | Add hypothesis-protobuf library to the 3rd party doc.
| * | Add hypothesis-protobuf library to the 3rd party doc.H. Chase Stevens2017-11-131-0/+1
|/ /
* | MMinor fix-ups to C# tests from changes in earlier commitsJon Skeet2017-11-124-20/+30
| |
* | Regenerated test code for C#Jon Skeet2017-11-126-295/+330
| |
* | Move C#-only test protos to csharp/protosJon Skeet2017-11-128-28/+413
| | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
* | Run C# codegen when testing itJon Skeet2017-11-121-3/+5
| | | | | | | | | | This will cause failures if shared protos change in an incompatible way.
* | Merge pull request #3858 from jtattermusch/parsing_from_sliceJan Tattermusch2017-11-102-4/+44
|\ \ | | | | | | C#: Allow message parsing from an array slice
| * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-091-0/+14
| | |
| * | check already performed by MergeFromJan Tattermusch2017-11-091-5/+0
| | |
| * | allow message parsing from an array sliceJan Tattermusch2017-11-092-0/+31
|/ /
* | Merge pull request #3822 from mehrdada/update-benchmark-submoduleJisi Liu2017-11-061-0/+0
|\ \ | | | | | | Update google/benchmark submodule to v1.2
| * | Update google/benchmark submodule to v1.2Mehrdad Afshari2017-10-301-0/+0
| | | | | | | | | | | | Fixed some build issues on ppc64le architecture
* | | Fix php well known type conformance tests (#3828)Paul Yang2017-11-0312-164/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix php well known type conformance tests * Properly generate code for test.proto * Provide GPBMetadata files in c extensions for generated files to import. * Remove unnecessary test * Clean up code * Add declaration for initOnce. * Refactoring
* | | Merge pull request #3839 from thomasvl/message_equalityThomas Van Lenten2017-11-031-3/+4
|\ \ \ | |_|/ |/| | When comparing message, require them to have the same descriptor.
| * | When comparing message, require them to have the same descriptor.Thomas Van Lenten2017-11-031-3/+4
|/ / | | | | | | | | This will cover someone subclassing the message, and also handles something crazy like someone comparing to a raw NSObject.
* / Fix merging with message-valued oneofJon Skeet2017-10-3113-12/+417
|/ | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation.
* Merge pull request #3817 from xuwei-k/joda-urlFeng Xiao2017-10-304-4/+4
|\ | | | | update joda-time javadoc url
| * update joda-time javadoc urlxuwei-k2017-10-304-4/+4
|/
* Add parser settings WithXyz methodsJon Skeet2017-10-281-0/+17
|
* Add JsonParser setting to ignore unknown field valuesJon Skeet2017-10-284-7/+95
| | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838.
* Merge pull request #3722 from timou/cmake-windows-cleanJisi Liu2017-10-271-1/+20
|\ | | | | Suppress VS2017 compiler/linker warnings
| * Sort MSVC warning suppressionsTim Ebringer2017-10-211-1/+17
| | | | | | | | Add brief documentation describing each warning suppression.
| * Suppress VS2017 compiler/linker warningsTim Ebringer2017-10-061-1/+4
| | | | | | | | | | | | | | | | VS2017 warns about a few additional things, for example, files that define no symbols (which is typically the result of a platform specific ifdef not applying on Windows). Suppress these warnings so the build is clean on VS2017.
* | Reserve unknown in Ruby (#3763)Paul Yang2017-10-2612-832/+2034
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown in ruby * Revert ruby tests. Wait for cpp impl for conformance test * Add conformance test for preserving unknown * Add unknown field conformance test to csharp failure list. * Fix comments * Fix comment * Fix comments * Fix typo * Use stringsink_string directly * Mark hd unused * Remove unused encodeunknown_handlerfunc
* | Add missing filesJisi Liu2017-10-261-0/+38
| |
* | Merge pull request #3804 from pherl/mergeJisi Liu2017-10-263-2/+7
|\ \ | | | | | | Merge 3.4.x into master before cutting 3.5.x
| * \ Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-253-2/+7
| |\ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-25 23:03:16 +0000