aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add test for nested enum for php (#2989)Paul Yang2017-04-194-0/+22
|
* Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-195-53/+54
| | | | Fix the bug by sharing the code for generating class name for both message and enum.
* Make PHP c extension work with PHP7 (#2951)Paul Yang2017-04-1923-1187/+1891
|
* Merge pull request #2967 from xfxyjwf/3.3.xFeng Xiao2017-04-118-4/+528
|\ | | | | Fix map serialization
| * Cherry-pick cl/152450543Feng Xiao2017-04-118-2/+472
| |
| * Cherry-pick cl/151775298Feng Xiao2017-04-112-2/+56
|/
* Merge pull request #2955 from xfxyjwf/3.3.xFeng Xiao2017-04-111-0/+1
|\ | | | | Add include for INT_MAX
| * Add include for INT_MAXFeng Xiao2017-04-081-0/+1
| |
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-104-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.xFeng Xiao2017-04-072-0/+10
|\ | | | | Cleanup reflection objects for map entry.
| * Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
| |
* | Merge pull request #2942 from xfxyjwf/3.3.xFeng Xiao2017-04-0624-42/+150
|\| | | | | Update version number and changelog for 3.3.0
| * Update generated code.Feng Xiao2017-04-0513-26/+26
| |
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-0511-16/+124
|/
* Update Java conformance failure list.Feng Xiao2017-03-311-1/+0
|
* Use "git reset --hard" to actually reset the code.Feng Xiao2017-03-312-3/+3
|
* Update jenkins Java dependencies.Feng Xiao2017-03-311-1/+1
|
* Update Java version number and dependency.Feng Xiao2017-03-303-4/+10
|
* Update objective-c conformance failure list.Feng Xiao2017-03-301-2/+4
|
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
|
* Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
|
* Update python conformance failure list.Feng Xiao2017-03-301-3/+0
|
* Update jenkins Java maven dependencies.Feng Xiao2017-03-301-1/+1
|
* Update C# conformance failure list.Feng Xiao2017-03-291-0/+4
|
* Update python conformance failure list.Feng Xiao2017-03-292-1181/+0
|
* Fix Java build.Feng Xiao2017-03-294-4/+11
|
* Update BUILD file for C# tests.Feng Xiao2017-03-291-0/+4
|
* Fix C++ build for down-integration.Feng Xiao2017-03-298-49/+134
|
* Down-integrate from google3.Feng Xiao2017-03-29251-5181/+13289
|
* 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
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 19:29:15 +0000