Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removing undefined behavior and compiler warnings (#1315) | brian-peloton | 2017-05-23 | 7 | -32/+38 |
| | | | | | | | | | | | | | | | | | | | * Comment out unused arguments. These last few are all that's needed to compile with -Wunused-arguments. * Fix missing struct field initializer. With this fix, everything compiles with -Wmissing-field-initializers. * Add support for disabling unaligned memory accesses on x86 too. ubsan doesn't like these because they are technically undefined behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily. * Avoid undefined integer overflow. ubsan catches all of these. | ||||
* | Merge pull request #3126 from mbrukman/fix-readme-formatting | Feng Xiao | 2017-05-23 | 1 | -38/+45 |
|\ | | | | | Fix Markdown formatting in README. | ||||
| * | Fix Markdown formatting in README. | Misha Brukman | 2017-05-23 | 1 | -38/+45 |
| | | | | | | | | | | | | | | | | | | | | Fix indentation to enable code formatting for sample command lines to set them visually apart from the surrounding text, and make it easy to copy-paste. Add code formatting for env vars, paths, binary and library names for readability. Hide URLs behind text for readability and conciseness. | ||||
* | | Merge pull request #3117 from KarrokDC/master | Feng Xiao | 2017-05-23 | 1 | -0/+6 |
|\ \ | | | | | | | Show help if protoc is called without any arguments | ||||
| * | | show help if protoc is called without any arguments, pre-empts -h and --help ↵ | Dennis Cappendijk | 2017-05-22 | 1 | -0/+6 |
| |/ | | | | | | | to show a useful message instead of just 'Missing input file.' | ||||
* | | Merge pull request #3103 from sergiocampama/perf | Thomas Van Lenten | 2017-05-23 | 1 | -0/+106 |
|\ \ | |/ |/| | Adds serial and parallel parsing tests. | ||||
| * | Adds serial and parallel parsing tests to check if parallel parsing is ↵ | Sergio Campama | 2017-05-23 | 1 | -0/+106 |
|/ | | | | faster than serial parsing, which it should | ||||
* | Merge pull request #3104 from thomasvl/ext_registry_copy | Thomas Van Lenten | 2017-05-17 | 7 | -23/+187 |
|\ | | | | | Fix ExtensionRegistry copying and add tests. | ||||
| * | Fix ExtensionRegistry copying and add tests. | Thomas Van Lenten | 2017-05-17 | 7 | -23/+187 |
|/ | | | | | | | | | - Fix up -copyWithZone: to not leave the two registries sharing some of the storage by using -addExtensions:. - Improve -addExtensions: to clone the sub dict when there is nothing to merge into. - A ExtensionRegistry unittests. - Update project schemes to not have extra things in perf scheme. | ||||
* | Merge pull request #2815 from devwout/ruby_json_emit_defaults | Joshua Haberman | 2017-05-15 | 2 | -33/+149 |
|\ | | | | | Ruby version optionally emits default values in JSON encoding. | ||||
| * | Ruby tests compare parsed JSON instead of raw JSON | Ewout | 2017-03-17 | 1 | -12/+89 |
| | | |||||
| * | Ruby version optionally emits default values in JSON encoding. | Ewout | 2017-03-09 | 2 | -29/+68 |
| | | | | | | | | | | Usage: Message.encode_json(m, emit_defaults: true) Message fields that are nil will still not appear in the encoded JSON. | ||||
* | | Merge pull request #3062 from Oppen/master | Feng Xiao | 2017-05-08 | 1 | -1/+2 |
|\ \ | | | | | | | Workaround gcc < 4.5.0 bug | ||||
| * | | Workaround gcc < 4.5.0 bug | Mario J. Rugiero | 2017-05-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com> | ||||
* | | | Add compatibility test for php. (#3041) | Paul Yang | 2017-05-05 | 6 | -4/+129 |
|/ / | | | | | | | | | | | * Add compatibility test for php. * Revert API incompatible change. | ||||
* | | Merge pull request #3043 from acozzette/javascript | Adam Cozzette | 2017-05-04 | 1 | -4/+0 |
|\ \ | | | | | | | Removed mention of Buffer in byteSourceToUint8Array | ||||
| * | | Removed mention of Buffer in byteSourceToUint8Array | Adam Cozzette | 2017-05-02 | 1 | -4/+0 |
|/ / | | | | | | | | | | | The Closure compiler complains about Buffer since that class exists only in Node. That logic does not seem to be needed (unit tests and conformance tests pass without it), so let's just remove it to solve the problem. | ||||
* | | Merge pull request #2873 from myitcv/fix_1562 | Adam Cozzette | 2017-05-02 | 3 | -14/+14 |
|\ \ | | | | | | | Javascript: use goog.crypt.byteArrayToString instead of String.fromCharCode.apply | ||||
| * | | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵ | Paul Jolly | 2017-05-02 | 3 | -14/+14 |
|/ / | | | | | | | String.fromCharCode.apply | ||||
* | | Merge pull request #3024 from acozzette/merge-3.3-to-master | Adam Cozzette | 2017-05-01 | 313 | -6623/+15491 |
|\ \ | | | | | | | Merged 3.3.x branch to master | ||||
| * \ | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master | Adam Cozzette | 2017-04-27 | 313 | -6623/+15491 |
| |\ \ | |||||
| | * | | Add prefix to enum value with reserved name. (#3020)v3.3.0 | Paul Yang | 2017-04-26 | 2 | -4/+5 |
| | | | | |||||
| | * | | Add a test case for nested enum, which was missed previously. (#3010) | Paul Yang | 2017-04-25 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add nested enum descriptor in php rumtime. (#3009)v3.3.0rc1 | Paul Yang | 2017-04-24 | 3 | -1/+11 |
| | | | | |||||
| | * | | Update php version number to 3.3.0 (#3001) | Paul Yang | 2017-04-24 | 2 | -6/+22 |
| | | | | |||||
| | * | | Throw exception when parsing invalid data. (#3000) | Paul Yang | 2017-04-21 | 6 | -49/+297 |
| | | | | |||||
| | * | | Merge pull request #2996 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Fix python3 issue. | ||||
| | | * | | Fix python3 issue. | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Allow proto files to import descriptor.proto (#2995) | Paul Yang | 2017-04-20 | 8 | -5/+51 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files. | ||||
| | * | | Prepend "PB" to generated classes whose name are reserved words. (#2990) | Paul Yang | 2017-04-20 | 8 | -61/+163 |
| | | | | |||||
| | * | | Add test for nested enum for php (#2989) | Paul Yang | 2017-04-19 | 4 | -0/+22 |
| | | | | |||||
| | * | | Enum defined without package have incorrect class name. (#2988) | Paul Yang | 2017-04-19 | 5 | -53/+54 |
| | | | | | | | | | | | | | | | | Fix the bug by sharing the code for generating class name for both message and enum. | ||||
| | * | | Make PHP c extension work with PHP7 (#2951) | Paul Yang | 2017-04-19 | 23 | -1187/+1891 |
| | | | | |||||
| | * | | Merge pull request #2967 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 8 | -4/+528 |
| | |\ \ | | | | | | | | | | | Fix map serialization | ||||
| | | * | | Cherry-pick cl/152450543 | Feng Xiao | 2017-04-11 | 8 | -2/+472 |
| | | | | | |||||
| | | * | | Cherry-pick cl/151775298 | Feng Xiao | 2017-04-11 | 2 | -2/+56 |
| | |/ / | |||||
| | * | | Merge pull request #2955 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | Add include for INT_MAX | ||||
| | | * | | Add include for INT_MAX | Feng Xiao | 2017-04-08 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) | Jie Luo | 2017-04-10 | 4 | -8/+45 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions. | ||||
| | * | | Merge pull request #2949 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-07 | 2 | -0/+10 |
| | |\ \ | | | | | | | | | | | Cleanup reflection objects for map entry. | ||||
| | | * | | Cleanup reflection objects for map entry. | Feng Xiao | 2017-04-06 | 2 | -0/+10 |
| | | | | | |||||
| | * | | | Merge pull request #2942 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-06 | 24 | -42/+150 |
| | |\| | | | | | | | | | | | | Update version number and changelog for 3.3.0 | ||||
| | | * | | Update generated code. | Feng Xiao | 2017-04-05 | 13 | -26/+26 |
| | | | | | |||||
| | | * | | Update version number and changelog for 3.3.0 | Feng Xiao | 2017-04-05 | 11 | -16/+124 |
| | |/ / | |||||
| | * | | Update Java conformance failure list. | Feng Xiao | 2017-03-31 | 1 | -1/+0 |
| | | | | |||||
| | * | | Use "git reset --hard" to actually reset the code. | Feng Xiao | 2017-03-31 | 2 | -3/+3 |
| | | | | |||||
| | * | | Update jenkins Java dependencies. | Feng Xiao | 2017-03-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Java version number and dependency. | Feng Xiao | 2017-03-30 | 3 | -4/+10 |
| | | | | |||||
| | * | | Update objective-c conformance failure list. | Feng Xiao | 2017-03-30 | 1 | -2/+4 |
| | | | | |||||
| | * | | Fix C++ distcheck. | Feng Xiao | 2017-03-30 | 1 | -0/+2 |
| | | | |