aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
* 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-2433-671/+846
|\
| * 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-2320-228/+246
* | 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 remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-27174-4857/+11152
|\
| * 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-051-5/+5
| * Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
| * Down-integrate from google3.Feng Xiao2017-03-29168-4780/+10501
* | 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