aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-27313-6623/+15491
|\
| * Add prefix to enum value with reserved name. (#3020)v3.3.0Paul Yang2017-04-262-4/+5
| |
| * Add a test case for nested enum, which was missed previously. (#3010)Paul Yang2017-04-251-0/+1
| |
| * Add nested enum descriptor in php rumtime. (#3009)v3.3.0rc1Paul Yang2017-04-243-1/+11
| |
| * Update php version number to 3.3.0 (#3001)Paul Yang2017-04-242-6/+22
| |
| * Throw exception when parsing invalid data. (#3000)Paul Yang2017-04-216-49/+297
| |
| * Merge pull request #2996 from xfxyjwf/3.3.xFeng Xiao2017-04-201-1/+1
| |\ | | | | | | Fix python3 issue.
| | * Fix python3 issue.Feng Xiao2017-04-201-1/+1
| | |
| * | Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-208-5/+51
| |/ | | | | | | | | | | | | | | | | descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files.
| * Prepend "PB" to generated classes whose name are reserved words. (#2990)Paul Yang2017-04-208-61/+163
| |
| * 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
| |
* | Merge pull request #3023 from acozzette/minAdam Cozzette2017-04-271-1/+1
|\ \ | | | | | | Fully qualify min as std::min in wire_format_lite.cc
| * | Fully qualify min as std::min in wire_format_lite.ccAdam Cozzette2017-04-271-1/+1
|/ /
* | Merge pull request #3018 from acozzette/using-namespace-stdAdam Cozzette2017-04-2615-98/+108
|\ \ | | | | | | Remove "using namespace std" from stubs/common.h
| * | Remove "using namespace std" from stubs/common.hAdam Cozzette2017-04-2615-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-constsFeng Xiao2017-04-261-2/+0
|\ \ \ | |/ / |/| | Remove unused constants.
| * | Remove unused constants.Jakob Buchgraber2017-04-251-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-1Feng Xiao2017-04-241-12/+13
|\ \ | | | | | | Add a link to dart-lang/protobuf
| * | Add a link to dart-lang/protobufpostmasters2017-04-241-12/+13
|/ /
* | Merge pull request #2992 from xiaogaozi/patch-1Feng Xiao2017-04-201-1/+1
|\ \ | | | | | | Add gogoprotobuf to third-party add-ons list
| * | Add gogoprotobuf to third-party add-ons listChangjian Gao2017-04-201-1/+1
|/ /
* | Merge pull request #2508 from yliu120/pass_default_env_to_protocFeng Xiao2017-04-190-0/+0
|\ \ | | | | | | add a key to ctx.action dict to prevent protoc losing the default env
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 13:04:08 +0000