aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-2517-41/+52
|\
| * Work around MSVC issue with std::atomic initialization (#4777)Adam Cozzette2018-06-181-0/+9
| * Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
| * Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| * Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-251-1/+5
| * PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-252-145/+187
| * PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-251-8/+46
| * Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-251-3/+16
| * Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-251-17/+37
| * Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
| * Update version number to 3.6.0Jisi Liu2018-05-1414-32/+32
* | Fix parameters declarationvervaekejonathan2018-06-221-2/+2
* | Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-214-2/+21
|\ \
| * | protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-214-2/+21
* | | Merge pull request #4812 from htuch/fix-any-caseFeng Xiao2018-06-213-0/+88
|\ \ \
| * | | Added TODO for grouping options.Harvey Tuch2018-06-211-0/+3
| * | | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-213-0/+85
| |/ /
* | | Merge pull request #4811 from htuch/invalid-name-jsonFeng Xiao2018-06-211-1/+2
|\ \ \
| * | | Additional whitespace.Harvey Tuch2018-06-211-1/+1
| * | | json: include field name in InvalidName status messages.Harvey Tuch2018-06-211-1/+2
| |/ /
* | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6Adam Cozzette2018-06-201-0/+6
|\ \ \
| * | | Disable thread local storage for OSX < 10.7Gregor Jasny2016-02-191-0/+6
* | | | Merge pull request #4780 from mwei0210/masterAdam Cozzette2018-06-201-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | not emptyming2018-06-191-1/+1
| * | | check provided sizeming2018-06-191-1/+2
* | | | Merge pull request #4626 from robhancocksed/masterFeng Xiao2018-06-1813-39/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Declare some generated C++ methods as static #4602Robert Hancock2018-05-1413-39/+39
* | | | Merge pull request #2121 from mazurkin/issue-2108Feng Xiao2018-06-185-22/+44
|\ \ \ \
| * | | | [issue-2108] [protoc/java] Excessive copying on buildPartial()Nickolay Mazurkin2016-09-185-22/+44
* | | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707)medinandres2018-06-181-1/+1
* | | | | Merge pull request #4739 from asimshankar/tf-bytesizeFeng Xiao2018-06-181-1/+5
|\ \ \ \ \
| * | | | | Graceful failure in SerializeToArray().Asim Shankar2018-06-071-1/+5
* | | | | | Merge pull request #3901 from wijagels/masterFeng Xiao2018-06-112-28/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Stop unused parameter warnings for generated code in RegisteredArenaDtorWilliam Jagels2017-11-162-28/+28
* | | | | | Remove js_embed binary. (#4709)Feng Xiao2018-06-013-130/+226
* | | | | | Added Clang thread-safety annotations in mutex.hAdam Cozzette2018-05-301-3/+17
* | | | | | Move methods out of class (#4697)Paul Yang2018-05-292-15/+26
* | | | | | Add back GeneratedClassName to public (#4686)Paul Yang2018-05-251-0/+10
* | | | | | PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-242-145/+187
* | | | | | PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-241-8/+46
* | | | | | Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-171-3/+16
* | | | | | re-write int128 long division to avoid license impact from stackoverflow refe...NickFengIBM2018-05-171-34/+18
* | | | | | Merge pull request #4624 from eughermann/hash-ub-fixAdam Cozzette2018-05-151-7/+7
|\ \ \ \ \ \
| * | | | | | Remove undefined behavior from the hash function.Eugene Hermann2018-05-141-7/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-141-17/+37
| |_|_|/ / |/| | | |
* | | | | fix index out of range error in C# generation using msvc (#1329)Warren Falk2018-05-141-1/+1
|/ / / /
* | | | Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-113-165/+535
* | | | Fix error in Clang UndefinedBehaviorSanitizerPetter Strandmark2018-05-041-4/+6
* | | | MinGW build failedIvan Shynkarenka2018-05-021-1/+1
* | | | typoBrady Killeen2018-04-261-1/+1