aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-023-14/+2
|\ | | | | Cherry pick c# changes from master
| * Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| |
* | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-171-2/+10
| | | | | | | | Fixes extra whitespace on generated comments.
* | Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-179-37/+74
| | | | | | | | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866
* | Add and fix C++ runtime docsJisi Liu2016-08-0214-8/+97
|/
* Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| | | | Remove the use of INT64_C/UINT64_C and add static_cast when neccessary.
* Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-253-13/+51
|\ | | | | | | We need to pick up some of the last-minute Ruby fixes.
| * 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.
| | * Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.Josh Haberman2016-07-253-7/+7
| | | | | | | | | | | | | | | This brings us more into line with other langauges, and makes it more obvious when we are requiring protobuf generated code.
* | | Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
|/ / | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/823 Change-Id: I7f4c2bfcac2f81d8b34c030dd3d12ea02aaa2264
* / Correctly sets the generate_for_named_framework option after parsing.Sergio Campama2016-07-231-8/+17
|/ | | | - Also updates the documentation with a bit more information.
* Merge pull request #1829 from xfxyjwf/fixcppFeng Xiao2016-07-233-343/+6
|\ | | | | Fix sign-comparison warnings and add a test for that.
| * 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-221-337/+0
| | | | | | | | | | | | | | | | grpc build treates them as errors and such issues (protobuf change breaks grpc) has been reported repeatedly. For example: https://github.com/google/protobuf/issues/1813 Change-Id: I077c4557cf3effd5195f88802c38999b884edc30
* | Fixes the parsing of the proto-framework map file.Sergio Campama2016-07-222-2/+3
|/ | | | | - Fixes memory issue where the pointer to the StringPiece would be allocated on the stack, and would mangle the output. - Fixes length of the file name when parsing the comma separated files.
* Merge pull request #1810 from xfxyjwf/versioningFeng Xiao2016-07-204-38/+57
|\ | | | | Versioning Java GeneratedMessage class
| * Versioning Java GeneratedMessage.Feng Xiao2016-07-194-38/+57
| | | | | | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* | 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: segregate references to binary functionality
| * 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
| | | | | | | | | | | | This change will help us separate binary support into separate files, because we only refer to binary serialization functions in the actual binary serialization paths.
* | Merge remote-tracking branch 'origin/3.0.0-beta-4'Feng Xiao2016-07-1849-473/+1249
|\ \ | |/ |/|
| * Fix compatiblity issues.Feng Xiao2016-07-141-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some public API methods are defined in GenreatedMessage.java and they have a generric return type: class GeneratedMessage { class Builder<BuilderType extends Builder<BuilderType>> { public BuilderType setField(...); public BuilderType setExtension(...); } } With these definitions, the compiled byte code of a callsite will have a direct reference to GeneratedMessage. For example: fooBuilder.setField(...); becomes: ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder ##: checkcast // class Builder This will prevent us from updating generated classes to subclass a different versioned GeneratedMessageV3 class in the future (we can't do it in a binary compatible way). This change addresses the problem by overriding these methods directly in the generated class: class Foo { class Builder extends GeneratedMessage.Builder<Builder> { public Builder setField(...) { return super.setField(...); } } } After this, fooBuilder.setField(...) will be compiled to: ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder The callsites will no longer reference GeneratedMessage directly and we can change Foo to subclass GeneratedMessageV3 without breaking binary compatiblity. The downside of this change is: 1. It increases generated code size (though it saves some instructions on the callsites). 2. We can never stop generating these overrides because doing that will break binary compatibility. Change-Id: I879afbbc1325a66324a51565e017143489b06e97
| * 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
|/ | | | | | | | When building into frameworks, the generated code doesn't always have direct access to the proto internals. Instead of opening up the access, just use the public method to fetch the correct oneof. Fixes https://github.com/google/protobuf/issues/1789
* Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0713-41/+64
|\ | | | | Change placement of DebuggerNonUserCodeAttribute
| * Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| | | | | | | | | | | | This does not affect the generated code. If we decide we want to apply attributes to generated types, we should start by just reverting this change.
| * Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
| | | | | | | | | | | | | | | | | | I think this has caught everything. I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything. Follow-up commit will include the changes to generated code itself. Fixes #1671.
* | 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 problems detected when integrating the code to our internal repo.
| * | 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 fields
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
| | | | | | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* | Fix windows build.Feng Xiao2016-06-302-7/+14
| | | | | | | | Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
* | Integrated internal changes from GoogleAdam Cozzette2016-06-29128-1318/+4351
|/ | | | This includes all internal changes from around May 20 to now.
* Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-171-3/+11
|\ | | | | JS: import well-known types from google-protobuf package.
| * Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| |
| * JS: import well-known types from google-protobuf package.Josh Haberman2016-06-161-0/+8
| |
* | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-174-127/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better docs in the generator for the different options that can be passed during an invoke of protoc. - Add named_framework_to_proto_path_mappings_path to pass the path to a file containing mappings of frameworks for different proto files. - Update the generation to use the mapping to change the #import directives it creates. Note: the changes in helpers is mostly moving code within the fine, and then a small change to expose the parsing so a passed on class can consume the line. Fixes https://github.com/google/protobuf/issues/1457
* | Address review comments on function namevjpai2016-06-161-2/+2
| |
* | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/ | | | | | | constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 06:10:05 +0000