Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2950 from anuraaga/dev_rag | Feng Xiao | 2017-04-12 | 4 | -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 Agrawal | 2017-04-07 | 4 | -25/+8 |
|/ | | | | mutation method. | ||||
* | Merge pull request #2937 from anuraaga/dev_rag2 | Adam Cozzette | 2017-04-06 | 1 | -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 Agrawal | 2017-04-05 | 1 | -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 Agrawal | 2017-04-04 | 1 | -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/master | Jie Luo | 2017-04-05 | 1 | -1/+1 |
|\ \ | | | | | | | Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() | ||||
| * | | Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() | Jie Luo | 2017-03-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2933 from mharrend/patch-1 | Adam Cozzette | 2017-04-04 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Adding default shell env to allow non-default compilers | ||||
| * | | | Adding default shell env | Marco A. Harrendorf | 2017-04-03 | 1 | -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_rag | Adam Cozzette | 2017-04-04 | 2 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Fix error message for int64 parse failure. | ||||
| * | | | | Fix error message for int64 parse error. | Anuraag Agrawal | 2017-04-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add IntelliJ project to gitignore for java project. | Anuraag Agrawal | 2017-04-03 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2676 from acozzette/js-compatibility-tests | Adam Cozzette | 2017-04-03 | 33 | -55/+5943 |
|\ \ \ \ | |_|/ / |/| | | | JS compatibility tests | ||||
| * | | | Added compatibility tests for version 3.0.0 | Adam Cozzette | 2017-04-03 | 31 | -46/+5878 |
| | | | | |||||
| * | | | Split test protos into two groups | Adam Cozzette | 2017-04-03 | 2 | -9/+65 |
|/ / / | |||||
* | | | Removes ignored const from return type (#2915) | Juan David Dominguez | 2017-03-29 | 1 | -1/+1 |
| | | | | | | | | | See https://github.com/google/protobuf/issues/2425 | ||||
* | | | Merge pull request #2919 from thomasvl/drop_dispatch | Thomas Van Lenten | 2017-03-29 | 2 | -17/+20 |
|\ \ \ | | | | | | | | | Remove the use of dispatch_once that is heap backed. | ||||
| * | | | Remove the use of dispatch_once that is heap backed. | Thomas Van Lenten | 2017-03-29 | 2 | -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_3 | Thomas Van Lenten | 2017-03-29 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Add support for Xcode 8.3 to the build helper. | ||||
| * | | | Add support for Xcode 8.3 to the build helper. | Thomas Van Lenten | 2017-03-29 | 1 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #2913 from thomasvl/conformance_ignores | Thomas Van Lenten | 2017-03-29 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add some new ignores for things generated in conformance. | ||||
| * | | | Add some new ignores for things generated in conformance. | Thomas Van Lenten | 2017-03-28 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix gcc warning when using map (#2213) | drivehappy | 2017-03-28 | 1 | -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/nacl | Adam Cozzette | 2017-03-28 | 1 | -1/+8 |
|\ \ \ \ | |/ / / |/| | | | Added a workaround to allow building for NaCl | ||||
| * | | | Added a workaround to allow building for NaCl | Adam Cozzette | 2017-03-28 | 1 | -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_limit | Thomas Van Lenten | 2017-03-28 | 2 | -10/+23 |
|\ \ \ | | | | | | | | | Raise the recursion limit to 100 to match other languages. | ||||
| * | | | Raise the recursion limit to 100 to match other languages. | Thomas Van Lenten | 2017-03-28 | 2 | -10/+23 |
|/ / / | |||||
* | | | Merge pull request #2858 from haberman/gopackage | Joshua Haberman | 2017-03-27 | 2 | -4/+5 |
|\ \ \ | | | | | | | | | Changed go_package for plugin.proto. | ||||
| * | | | Properly regenerated descriptor.proto. | Josh Haberman | 2017-03-16 | 1 | -3/+4 |
| | | | | |||||
| * | | | Changed go_package for plugin.proto. | Josh Haberman | 2017-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289 | ||||
* | | | | Merge pull request #1662 from haberman/jsconformance | Joshua Haberman | 2017-03-27 | 7 | -9/+237 |
|\ \ \ \ | | | | | | | | | | | Conformance tests for JavaScript (Node.js). 15 tests are failing. | ||||
| * | | | | Removed obsolete comments and added docs. | Josh Haberman | 2017-03-16 | 2 | -5/+30 |
| | | | | | |||||
| * | | | | Build system fixes for JS conformance tests. | Josh Haberman | 2017-03-14 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | Conformance test for JS now work, though 15 tests fail. | Josh Haberman | 2017-03-13 | 3 | -27/+49 |
| | | | | | |||||
| * | | | | Added JavaScript conformance tests. All tests pass! | Josh Haberman | 2017-03-06 | 5 | -1/+180 |
| | | | | | |||||
| * | | | | WIP. | Josh Haberman | 2017-03-06 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #2884 from anandolee/master | Jie Luo | 2017-03-27 | 3 | -19/+78 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options. | ||||
| * | | | Add FormatEnumAsInt support for Json Format. And scale ↵ | Jie Luo | 2017-03-24 | 3 | -19/+78 |
| | | | | | | | | | | | | | | | | JsonFormatter.Settings to multiple options. | ||||
* | | | | Merge pull request #2897 from cgrushko/patch-5 | Feng Xiao | 2017-03-22 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Compile the Java proto runtime with Java 6 | ||||
| * | | | | Compile the Java proto runtime with Java 6 | cgrushko | 2017-03-22 | 1 | -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 Yang | 2017-03-21 | 5 | -6/+8 |
| | | | | |||||
* | | | | Merge pull request #2861 from byronyi/#710 | Adam Cozzette | 2017-03-20 | 7 | -0/+209 |
|\ \ \ \ | | | | | | | | | | | migrate delimited messages functions to util package | ||||
| * | | | | Update BUILD | Bairen Yi | 2017-03-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update delimited_message_util_test.cc | Bairen Yi | 2017-03-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix several issues | Byron Yi | 2017-03-17 | 3 | -15/+15 |
| | | | | | |||||
| * | | | | add delimited_message_util.cc to libprotobuf.cmake | Byron Yi | 2017-03-16 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | add LIBPROTOBUF_EXPORT to make msvc happy | Byron Yi | 2017-03-16 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | migrate delimited messages functions to util package | Byron Yi | 2017-03-16 | 6 | -0/+207 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2860 from prehistoric-penguin/master | Feng Xiao | 2017-03-20 | 3 | -90/+0 |
|\ \ \ \ | | | | | | | | | | | Remove duplicated copyright statement | ||||
| * | | | | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 | 3 | -90/+0 |
| |/ / / |