Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3023 from acozzette/min | Adam Cozzette | 2017-04-27 | 1 | -1/+1 |
|\ | | | | | Fully qualify min as std::min in wire_format_lite.cc | ||||
| * | Fully qualify min as std::min in wire_format_lite.cc | Adam Cozzette | 2017-04-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3018 from acozzette/using-namespace-std | Adam Cozzette | 2017-04-26 | 15 | -98/+108 |
|\ | | | | | Remove "using namespace std" from stubs/common.h | ||||
| * | Remove "using namespace std" from stubs/common.h | Adam Cozzette | 2017-04-26 | 15 | -98/+108 |
| | | | | | | | | | | | | | | | | This prevents the contents of the std namespace from being effectively pulled into the top-level namespace in all translation units that include common.h. I left in individual using statements for a few common things like std::set and std::map, because it did not seem worth going through the churn of updating the whole codebase to fix those right now. | ||||
* | | Merge pull request #3015 from buchgr/unused-consts | Feng Xiao | 2017-04-26 | 1 | -2/+0 |
|\ \ | |/ |/| | Remove unused constants. | ||||
| * | Remove unused constants. | Jakob Buchgraber | 2017-04-25 | 1 | -2/+0 |
|/ | | | | | When compiling with -Werror, -Wunused-const-variable the build fails due to those two constants not being used. | ||||
* | Merge pull request #3008 from postmasters/patch-1 | Feng Xiao | 2017-04-24 | 1 | -12/+13 |
|\ | | | | | Add a link to dart-lang/protobuf | ||||
| * | Add a link to dart-lang/protobuf | postmasters | 2017-04-24 | 1 | -12/+13 |
|/ | |||||
* | Merge pull request #2992 from xiaogaozi/patch-1 | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
|\ | | | | | Add gogoprotobuf to third-party add-ons list | ||||
| * | Add gogoprotobuf to third-party add-ons list | Changjian Gao | 2017-04-20 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2508 from yliu120/pass_default_env_to_protoc | Feng Xiao | 2017-04-19 | 0 | -0/+0 |
|\ | | | | | add a key to ctx.action dict to prevent protoc losing the default env | ||||
| * | add a key to ctx.action dict to prevent protoc losing the default env | Yunlong Liu | 2016-12-16 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #2987 from konsumer/patch-1 | Feng Xiao | 2017-04-19 | 1 | -0/+1 |
|\ \ | | | | | | | Add node-protoc-plugin to "Other Utilities" | ||||
| * | | Add node-protoc-plugin to "Other Utilities" | David Konsumer | 2017-04-18 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #2982 from mda000/issue2972 | Adam Cozzette | 2017-04-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Simplify the Element dtor invocation when freeing elements in InternalDeallocate | ||||
| * | | Simplify the Element dtor invocation when freeing elements in | Michael Allen | 2017-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | InternalDeallocate to avoid confusing the compiler when there's a class named Element already defined in the global namespace. | ||||
* | | | Merge pull request #2985 from thomasvl/class_check_tweaks | Thomas Van Lenten | 2017-04-18 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Tighten up class usage/checks. | ||||
| * | | Tighten up class usage/checks. | Thomas Van Lenten | 2017-04-18 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | - Ensure extensions resolution/wiring is happening directly on the messageClass (incase someone is doing odd things our out classes). - Make the extension message check match the other class checks in for mergeFrom/isEqual/etc. | ||||
* | | 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 |
| | | | | | |