Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | | ||||||
* | | | 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() |