aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2519 from ↵Joshua Haberman2017-11-292-4/+18
|\ | | | | | | | | rubynerd-forks/ruby-fix-repeated-message-type-field unwrap descriptor class before comparison of RepeatedField types
| * test for field reassignment@rubynerd2017-10-121-0/+6
| |
| * handle sanity check for repeating enums correctly@rubynerd2016-12-301-3/+11
| |
| * unwrap descriptor class before comparison of RepeatedField types@rubynerd2016-12-191-1/+1
| | | | | | | | | | | | | | self->field_type_class returns the correct Ruby class, get_def_obj returns the Descriptor object used to generate the Ruby class via msgclass, so to compare the two types we get the msgclass from the descriptor.
* | Fix JsonTokenizer exception messageJon Skeet2017-11-291-1/+1
| |
* | Merge pull request #3960 from acozzette/libprotoc-export-fixAdam Cozzette2017-11-281-1/+1
|\ \ | | | | | | Added back in LIBPROTOC_EXPORT which was removed by mistake
| * | Added back in LIBPROTOC_EXPORT which was removed by mistakeAdam Cozzette2017-11-281-1/+1
|/ /
* | Merge pull request #3962 from jleni/fix_dotnetAdam Cozzette2017-11-281-1/+1
|\ \ | | | | | | Upgrading dotnet to 1.0.4
| * | Upgrading dotnet to 1.0.4Juan Leni2017-11-281-1/+1
| | |
* | | Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404Jisi Liu2017-11-271-0/+10
|\ \ \ | |/ / |/| | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac script
| * | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac scriptXiaoshuang LU2017-11-231-0/+10
|/ /
* | Merge pull request #3919 from jart/less-warningsFeng Xiao2017-11-211-0/+2
|\ \ | | | | | | Remove unhelpful build warnings
| * | Remove unhelpful build warningsJustine Tunney2017-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | -Wno-writable-strings removes 230 "ISO C++11 does not allow conversion from string literal to 'char *'" warnings from TensorFlow test / build output. These happen because pyext/ sources pass string literals to Python C API data structures, e.g. PyGetSetDef, which for some reason were designed to not have the const qualifier.
* | | Merge pull request #3918 from OEP/fix-sdistFeng Xiao2017-11-211-0/+3
|\ \ \ | |/ / |/| | Include .cc and .h files in Python source distribution
| * | Include .cc and .h files in source distributionPaul Kilgo2017-11-171-0/+3
|/ /
* | Small code reorder to maybe make #3893 happy.Thomas Van Lenten2017-11-171-1/+1
| | | | | | | | | | Use the ivar for the -open, so hopefully it lines up with the -close in dealloc and isn't seen as an unbalanced "open".
* | Travis config cleanups and move ObjC to Xcode 9.1.Thomas Van Lenten2017-11-162-53/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop having travis build the test matrix and make it explicit so extra settings are only on the test that need the, this helps make the travis UI a little cleaner (linux hosted stuff doesn't list an Xcode version), as well as avoid unneeded requirements limiting the travis pool something can run on. Small improvements to objectivec/DevTools/full_mac_build.sh to avoid some repeated scripting and hopefully make things more reliable work with Xcode 9.x. Don't mark the iOS tests as able to fail, hopefully with the new settings they are stable and won't give false signals. Simplify the case for xcode versions and fixup xcode 9.[0-1].
* | Add Setter/Getter type verification. (#3880)dmaclach2017-11-161-7/+285
| | | | | | | | | | | | Add runtime asserts (that can be disabled in release) that verify that the types being get/set for messages using the C Api match the type in the descriptor for the field being get/set.
* | 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
| | | |