aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge master into 3.4.xJisi Liu2017-07-1884-1014/+1728
|\
| * Support PHP generic services (#3269)Matt A2017-07-184-129/+353
| * Merge pull request #3348 from matthauck/fix-gcc41-againAdam Cozzette2017-07-171-2/+2
| |\
| | * Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
| * | Merge pull request #3357 from bklarson/masterAdam Cozzette2017-07-172-2/+2
| |\ \
| | * | Fix build when using -Werror=undefBrad Larson2017-07-122-2/+2
| | |/
| * | Merge pull request #3134 from lundefugl/javabug1Feng Xiao2017-07-172-5/+5
| |\ \
| | * | Issue 3112: Object class with fully qualified namelundefugl2017-05-242-5/+5
| * | | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-171-5/+2
| * | | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
| * | | Add space between arrow and casted type (#3353)Paul Yang2017-07-133-27/+27
| * | | Merge pull request #3327 from htuch/fix-3322Feng Xiao2017-07-131-7/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Use consistent hash across NDEBUG/!NDEBUG builds.Harvey Tuch2017-07-071-7/+0
| * | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Matt Hauck2017-07-101-2/+4
| * | | Add std:: namespace prefix to set and map (#3332)tanderson-google2017-07-0937-80/+78
| |/ /
| * | Add initialized as a reserved keyword as that's the actual property nameSergio Campama2017-06-291-1/+1
| * | adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-271-39/+120
| * | Merge pull request #3264 from TeBoring/php-bugPaul Yang2017-06-2434-672/+847
| |\ \
| | * | Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-2426-449/+606
| | * | Enusre public header and generated code have no implicit converion.Bo Yang2017-06-2321-229/+247
| * | | Merge pull request #2968 from ngg/cpp-proper-fwdFeng Xiao2017-06-234-107/+0
| |\ \ \ | | |/ / | |/| |
| | * | C++: Do not forward-declare dependencies in generated .h filesGergely Nagy2017-06-124-107/+0
| * | | Merge pull request #3240 from thomasvl/float_funThomas Van Lenten2017-06-191-1/+1
| |\ \ \
| | * | | Raise the number of digits used for floats.Thomas Van Lenten2017-06-161-1/+1
| * | | | Qualify string in java_options.hCalder Coalson2017-06-161-2/+2
| |/ / /
| * / / Export symbols used in inline functionsSilvio Traversaro2017-06-121-1/+1
| |/ /
| * | Merge pull request #3176 from acozzette/fix-3114Adam Cozzette2017-06-071-4/+10
| |\ \
| | * | Ensure that for Java, imports of .proto files with empty packages worksAdam Cozzette2017-06-021-4/+10
| * | | Add new file option php_namespace. (#3162)Paul Yang2017-06-054-177/+410
| |/ /
| * | not to use std::random_device for map.Seed(). (#3133)Wayne Zhang2017-05-301-13/+0
| * | Add ARRAY for reserved name (#3150)Paul Yang2017-05-291-2/+2
| * | Adds fluent setters for PHP (#3130)Brent Shaffer2017-05-291-0/+2
| |/
| * Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-237-32/+38
| * show help if protoc is called without any arguments, pre-empts -h and --help ...Dennis Cappendijk2017-05-221-0/+6
| * Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-051-1/+2
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-18169-4951/+11729
|/
* 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