aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-051-1/+2
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-27175-4873/+11187
|\
| * Add prefix to enum value with reserved name. (#3020)v3.3.0Paul Yang2017-04-261-4/+4
| * Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-201-0/+26
| * Prepend "PB" to generated classes whose name are reserved words. (#2990)Paul Yang2017-04-201-8/+27
| * Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-191-47/+35
| * 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_MAXFeng Xiao2017-04-081-0/+1
| * | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-101-2/+4
| |/
| * Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
| * Update generated code.Feng Xiao2017-04-0513-26/+26
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-052-8/+8
| * Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
| * Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
| * Down-integrate from google3.Feng Xiao2017-03-29169-4793/+10531
* | 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.hAdam Cozzette2017-04-2615-98/+108
* | | Remove unused constants.Jakob Buchgraber2017-04-251-2/+0
|/ /
* | Simplify the Element dtor invocation when freeing elements inMichael Allen2017-04-171-1/+1
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-072-6/+0
|/
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
* | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-204-0/+205
|\ \
| * | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| * | fix several issuesByron Yi2017-03-173-15/+15
| * | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| * | migrate delimited messages functions to util packageByron Yi2017-03-164-0/+205
| |/
* | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-202-60/+0
|\ \
| * | Remove duplicated copyright statementprehistoric-penguin2017-03-162-60/+0
| |/
* | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \
| * | fix attributes warningMarkus Heß2017-03-153-31/+31
* | | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \
| * | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| * | | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| | |/ | |/|
* | | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ \
| * | | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
* | | | Add file option php_class_prefix (#2849)Paul Yang2017-03-174-148/+358
* | | | Merge pull request #2848 from xfxyjwf/freebsdFeng Xiao2017-03-174-0/+63
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix freebsd build.Feng Xiao2017-03-144-0/+63
| | |/ | |/|
* | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutJoshua Haberman2017-03-152-8/+18
|\ \ \
| * | | compiler/cli: PrintHelpText prints to stdout instead of stderrEmmanuel Odeke2017-03-082-8/+18
* | | | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbolsAdam Cozzette2017-03-154-0/+42
|\ \ \ \
| * | | | Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-134-0/+42