aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-121-2/+10
* Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-099-37/+74
* close opened file descriptors properlyBryon Gloden, CISSP®2016-08-051-0/+1
* Merge pull request #1044 from mark-whiting/masterFeng Xiao2016-08-041-0/+18
|\
| * Adding missing generic gcc 64-bit atomicops.Mark Whiting2015-12-141-0/+18
* | Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-294-13/+26
|\ \
| * | Change the build.zip.sh to support liteJisi Liu2016-07-281-0/+4
| * | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| * | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
| * | Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-253-13/+51
| |\ \
| * | | Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
* | | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Clement Courbet2016-07-291-3/+4
* | | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-271-1/+1
* | | | Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| |/ / |/| |
* | | Ruby: translate package names from snake_case -> PascalCase.Josh Haberman2016-07-251-6/+44
* | | Merge pull request #1837 from haberman/rubygencodenameJoshua Haberman2016-07-253-7/+7
|\ \ \ | |/ / |/| |
| * | Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.Josh Haberman2016-07-253-7/+7
* | | Correctly sets the generate_for_named_framework option after parsing.Sergio Campama2016-07-231-8/+17
|/ /
* | Merge pull request #1829 from xfxyjwf/fixcppFeng Xiao2016-07-234-349/+34
|\ \
| * | Fix sign-comparison warnings in public header files.Feng Xiao2016-07-222-6/+6
| * | Add a test to catch sign-comparison warnings.Feng Xiao2016-07-222-343/+28
* | | Fixes the parsing of the proto-framework map file.Sergio Campama2016-07-222-2/+3
|/ /
* | Merge pull request #1810 from xfxyjwf/versioningFeng Xiao2016-07-205-39/+60
|\ \
| * | Add files missing from "make dist".Feng Xiao2016-07-191-1/+3
| * | Versioning Java GeneratedMessage.Feng Xiao2016-07-194-38/+57
* | | restore old behavior for toObjectNikolai Vavilov2016-07-191-10/+18
* | | nitsNikolai Vavilov2016-07-191-32/+21
* | | Make implicit defaults consistent with explicit defaultsNikolai Vavilov2016-07-191-33/+44
|/ /
* | Merge pull request #1802 from haberman/jsmapbinJoshua Haberman2016-07-181-32/+70
|\ \
| * | JavaScript: move extension binary info to separate struct.Josh Haberman2016-07-181-10/+40
| * | JavaScript maps: move binary callbacks out of constructor.Josh Haberman2016-07-181-22/+30
* | | Merge remote-tracking branch 'origin/3.0.0-beta-4'Feng Xiao2016-07-1850-473/+1250
|\ \ \ | |/ / |/| |
| * | Fix compatiblity issues.Feng Xiao2016-07-141-0/+68
| * | Add missing golden test file.Feng Xiao2016-07-141-0/+1
| * | Add missing LIBPROTOBUF_EXPORTFeng Xiao2016-07-131-4/+4
| * | Add missing LIBPROTOBUF_EXPORT.Feng Xiao2016-07-131-3/+4
| * | Update generated files.Feng Xiao2016-07-1312-256/+457
| * | Integrate from internal code base.Feng Xiao2016-07-1336-213/+719
* | | Use public methods to fetch oneofs in generated code.Thomas Van Lenten2016-07-181-1/+1
|/ /
* | Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0713-41/+64
|\ \
| * | Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| * | Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
* | | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
* | | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \ \
| * | | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| * | | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| |/ /
* | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
* | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0325-26/+26
|/ /
* | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214