Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make PHP c extension work with PHP7 (#2951) | Paul Yang | 2017-04-19 | 23 | -1187/+1891 |
| | |||||
* | Merge pull request #2967 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 8 | -4/+528 |
|\ | | | | | Fix map serialization | ||||
| * | Cherry-pick cl/152450543 | Feng Xiao | 2017-04-11 | 8 | -2/+472 |
| | | |||||
| * | Cherry-pick cl/151775298 | Feng Xiao | 2017-04-11 | 2 | -2/+56 |
|/ | |||||
* | Merge pull request #2955 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 1 | -0/+1 |
|\ | | | | | Add include for INT_MAX | ||||
| * | Add include for INT_MAX | Feng Xiao | 2017-04-08 | 1 | -0/+1 |
| | | |||||
* | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) | Jie Luo | 2017-04-10 | 4 | -8/+45 |
|/ | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions. | ||||
* | Merge pull request #2949 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-07 | 2 | -0/+10 |
|\ | | | | | Cleanup reflection objects for map entry. | ||||
| * | Cleanup reflection objects for map entry. | Feng Xiao | 2017-04-06 | 2 | -0/+10 |
| | | |||||
* | | Merge pull request #2942 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-06 | 24 | -42/+150 |
|\| | | | | | Update version number and changelog for 3.3.0 | ||||
| * | Update generated code. | Feng Xiao | 2017-04-05 | 13 | -26/+26 |
| | | |||||
| * | Update version number and changelog for 3.3.0 | Feng Xiao | 2017-04-05 | 11 | -16/+124 |
|/ | |||||
* | Update Java conformance failure list. | Feng Xiao | 2017-03-31 | 1 | -1/+0 |
| | |||||
* | Use "git reset --hard" to actually reset the code. | Feng Xiao | 2017-03-31 | 2 | -3/+3 |
| | |||||
* | Update jenkins Java dependencies. | Feng Xiao | 2017-03-31 | 1 | -1/+1 |
| | |||||
* | Update Java version number and dependency. | Feng Xiao | 2017-03-30 | 3 | -4/+10 |
| | |||||
* | Update objective-c conformance failure list. | Feng Xiao | 2017-03-30 | 1 | -2/+4 |
| | |||||
* | Fix C++ distcheck. | Feng Xiao | 2017-03-30 | 1 | -0/+2 |
| | |||||
* | Fix MSVC DLL build. | Feng Xiao | 2017-03-30 | 6 | -8/+10 |
| | |||||
* | Update python conformance failure list. | Feng Xiao | 2017-03-30 | 1 | -3/+0 |
| | |||||
* | Update jenkins Java maven dependencies. | Feng Xiao | 2017-03-30 | 1 | -1/+1 |
| | |||||
* | Update C# conformance failure list. | Feng Xiao | 2017-03-29 | 1 | -0/+4 |
| | |||||
* | Update python conformance failure list. | Feng Xiao | 2017-03-29 | 2 | -1181/+0 |
| | |||||
* | Fix Java build. | Feng Xiao | 2017-03-29 | 4 | -4/+11 |
| | |||||
* | Update BUILD file for C# tests. | Feng Xiao | 2017-03-29 | 1 | -0/+4 |
| | |||||
* | Fix C++ build for down-integration. | Feng Xiao | 2017-03-29 | 8 | -49/+134 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 251 | -5181/+13289 |
| | |||||
* | 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. |