aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2950 from anuraaga/dev_ragFeng Xiao2017-04-124-25/+8
|\ | | | | Allow unknown values for Map put*Value methods just like every other …
| * Allow unknown values for Map put*Value methods just like every other enum ↵Anuraag Agrawal2017-04-074-25/+8
|/ | | | mutation method.
* Merge pull request #2937 from anuraaga/dev_rag2Adam Cozzette2017-04-061-5/+15
|\ | | | | Fix duplicate fields test and Any test. The repeated version is passing because nu…
| * Fix test for unexpected type url when parsing Any. Currently, the test fails ↵Anuraag Agrawal2017-04-051-1/+1
| | | | | | | | since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields.
| * Fix duplicate fields test. The repeated version is passing because null ↵Anuraag Agrawal2017-04-041-4/+14
| | | | | | | | | | | | values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). Also fix spelling of a test.
* | Merge pull request #2922 from anandolee/masterJie Luo2017-04-051-1/+1
|\ \ | | | | | | Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()
| * | Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()Jie Luo2017-03-291-1/+1
| | |
* | | Merge pull request #2933 from mharrend/patch-1Adam Cozzette2017-04-041-0/+1
|\ \ \ | | | | | | | | Adding default shell env to allow non-default compilers
| * | | Adding default shell envMarco A. Harrendorf2017-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I am adding default shell environment, so that protobuf compilation makes use of set LD_LIBRARY_PATH and so on. In this way, also non-default gcc installations (e.g. not in /usr/lib) can be used to compile protobuf. This would fix the following issue: https://github.com/bazelbuild/bazel/issues/2515
* | | | Merge pull request #2930 from anuraaga/dev_ragAdam Cozzette2017-04-042-1/+3
|\ \ \ \ | | | | | | | | | | Fix error message for int64 parse failure.
| * | | | Fix error message for int64 parse error.Anuraag Agrawal2017-04-031-1/+1
| | | | |
| * | | | Add IntelliJ project to gitignore for java project.Anuraag Agrawal2017-04-031-0/+2
| | |_|/ | |/| |
* | | | Merge pull request #2676 from acozzette/js-compatibility-testsAdam Cozzette2017-04-0333-55/+5943
|\ \ \ \ | |_|/ / |/| | | JS compatibility tests
| * | | Added compatibility tests for version 3.0.0Adam Cozzette2017-04-0331-46/+5878
| | | |
| * | | Split test protos into two groupsAdam Cozzette2017-04-032-9/+65
|/ / /
* | | Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
| | | | | | | | | See https://github.com/google/protobuf/issues/2425
* | | Merge pull request #2919 from thomasvl/drop_dispatchThomas Van Lenten2017-03-292-17/+20
|\ \ \ | | | | | | | | Remove the use of dispatch_once that is heap backed.
| * | | Remove the use of dispatch_once that is heap backed.Thomas Van Lenten2017-03-292-17/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Apple recently updated the docs on dispatch_once to point out that the storage for the dispatch_once_t must be static or global, but not something that was ever used before as the implementation doesn't use a memory barrier. So we drop the use and create the semaphore when needed and use an atomic swap deal with any threading races.
* | | Merge pull request #2918 from thomasvl/xcode_8_3Thomas Van Lenten2017-03-291-0/+8
|\ \ \ | | | | | | | | Add support for Xcode 8.3 to the build helper.
| * | | Add support for Xcode 8.3 to the build helper.Thomas Van Lenten2017-03-291-0/+8
|/ / /
* | | Merge pull request #2913 from thomasvl/conformance_ignoresThomas Van Lenten2017-03-291-0/+2
|\ \ \ | | | | | | | | Add some new ignores for things generated in conformance.
| * | | Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
| | | |
* | | | Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression. * Updated per 80 character wrap.
* | | | Merge pull request #2914 from acozzette/naclAdam Cozzette2017-03-281-1/+8
|\ \ \ \ | |/ / / |/| | | Added a workaround to allow building for NaCl
| * | | Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
|/ / / | | | | | | | | | | | | | | | | | | arm-nacl-clang seems to produce a mysterious compiler error when it encounters __builtin_clzll, so when we are building for NaCl, let's avoid that in favor of the portable implementation of Log2FloorNonZero64.
* | | Merge pull request #2912 from thomasvl/objc_recursion_limitThomas Van Lenten2017-03-282-10/+23
|\ \ \ | | | | | | | | Raise the recursion limit to 100 to match other languages.
| * | | Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|/ / /
* | | Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\ \ \ | | | | | | | | Changed go_package for plugin.proto.
| * | | Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| | | |
| * | | Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
| | | | | | | | | | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
* | | | Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-277-9/+237
|\ \ \ \ | | | | | | | | | | Conformance tests for JavaScript (Node.js). 15 tests are failing.
| * | | | Removed obsolete comments and added docs.Josh Haberman2017-03-162-5/+30
| | | | |
| * | | | Build system fixes for JS conformance tests.Josh Haberman2017-03-141-3/+5
| | | | |
| * | | | Conformance test for JS now work, though 15 tests fail.Josh Haberman2017-03-133-27/+49
| | | | |
| * | | | Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-065-1/+180
| | | | |
| * | | | WIP.Josh Haberman2017-03-061-4/+4
| | | | |
* | | | | Merge pull request #2884 from anandolee/masterJie Luo2017-03-273-19/+78
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
| * | | Add FormatEnumAsInt support for Json Format. And scale ↵Jie Luo2017-03-243-19/+78
| | | | | | | | | | | | | | | | JsonFormatter.Settings to multiple options.
* | | | Merge pull request #2897 from cgrushko/patch-5Feng Xiao2017-03-221-0/+1
|\ \ \ \ | | | | | | | | | | Compile the Java proto runtime with Java 6
| * | | | Compile the Java proto runtime with Java 6cgrushko2017-03-221-0/+1
|/ / / / | | | | | | | | | | | | in order to avoid errors related to generics when building user code in newer versions of Java.
* | | | Update commit number in Docker to update composer dependency (#2869)Paul Yang2017-03-215-6/+8
| | | |
* | | | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-207-0/+209
|\ \ \ \ | | | | | | | | | | migrate delimited messages functions to util package
| * | | | Update BUILDBairen Yi2017-03-211-0/+1
| | | | |
| * | | | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| | | | |
| * | | | fix several issuesByron Yi2017-03-173-15/+15
| | | | |
| * | | | add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1
| | | | |
| * | | | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| | | | |
| * | | | migrate delimited messages functions to util packageByron Yi2017-03-166-0/+207
| | |_|/ | |/| |
* | | | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-203-90/+0
|\ \ \ \ | | | | | | | | | | Remove duplicated copyright statement
| * | | | Remove duplicated copyright statementprehistoric-penguin2017-03-163-90/+0
| |/ / /