Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Generate phpdoc in php generated files. (#2406) | Paul Yang | 2016-12-01 | 4 | -119/+1229 |
| | |||||
* | Merge pull request #2429 from thomasvl/issue1833_swift_prefix | Thomas Van Lenten | 2016-11-30 | 4 | -198/+424 |
|\ | | | | | Add a swift_prefix file option. | ||||
| * | Add a swift_prefix file option. | Thomas Van Lenten | 2016-11-30 | 4 | -198/+424 |
|/ | | | | | | | | Swift generators should default to CamelCasing the proto package and prefixing symbols with that, but this option allows developers to override that behavior with something custom if they desire. Fixes https://github.com/google/protobuf/issues/1833 | ||||
* | Merge pull request #2403 from google/down-integrate-with-msvc-fix | Adam Cozzette | 2016-11-23 | 297 | -13691/+15542 |
|\ | | | | | Integrated internal changes from Google | ||||
| * | Fixed Ruby tests for JRuby 1.7 | Adam Cozzette | 2016-11-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | This makes a couple of changes to fix the tests for JRuby 1.7: - Avoid using assert_false since that assertion seems not to exist in older versions - Disable a test related to respond_to? for JRuby. It's hard to tell what is going wrong here but it looks like probably a JRuby bug that has been fixed in more recent versions. | ||||
| * | Updated descriptor_pool.py to be compatible with Python 3 | Adam Cozzette | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | In Python 3 the values() method on a dictionary returns a view instead of a list, so we need to explicitly convert that to a list. | ||||
| * | Add a "u" suffix to tag numbers in generated code | Adam Cozzette | 2016-11-22 | 21 | -276/+334 |
| | | | | | | | | | | | | This seems to be necessary to prevent warnings in some compiler configurations, particularly for tag numbers that are too large to fit in a signed 32-bit int. | ||||
| * | Fixed descriptor_pool_test.py for Python 2.6 | Adam Cozzette | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | The curly brace syntax for sets was introduced in Python 2.7, and so for compatibility with 2.6 we need to avoid using it for now. | ||||
| * | Updated failure_list_java.txt for Java conformance test | Adam Cozzette | 2016-11-22 | 1 | -1/+0 |
| | | | | | | | | | | A new test is now passing and so we can remove it from the failure whitelist. | ||||
| * | Merge pull request #2400 from acozzette/jspb-test-fixes | Adam Cozzette | 2016-11-22 | 7 | -10/+16 |
| |\ | | | | | | | Fixed JSPB test failures | ||||
| | * | Added back in binary serialization round-trip in message_test.js | Adam Cozzette | 2016-11-21 | 1 | -0/+7 |
| | | | |||||
| | * | Fixed remaining JSPB test failures | Adam Cozzette | 2016-11-21 | 5 | -5/+10 |
| | | | |||||
| | * | Updated message_test.js so that it does not depend on fromObject | Adam Cozzette | 2016-11-21 | 1 | -7/+1 |
| | | | |||||
| | * | Updated enum names in test.proto to avoid conflicting with testbinary.proto | Adam Cozzette | 2016-11-21 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #2392 from xfxyjwf/fixdown | Feng Xiao | 2016-11-21 | 4 | -18/+60 |
| |\ \ | | |/ | |/| | Restore jenkins files. | ||||
| | * | Restore jenkins files. | Feng Xiao | 2016-11-18 | 4 | -18/+60 |
| |/ | | | | | | | | | | | | | | | The last up-integration from github to google3 was made at commit e28286fa05d8327fd6c5aa70cfb3be558f0932b8 but somehow the change in that commit is not actually in the up-integration CL and as a result that change was reverted by the down-integration. Restoring them should make the jenkins tests running again. | ||||
| * | Update EXTRA_DIST lists. | Feng Xiao | 2016-11-18 | 2 | -1/+4 |
| | | |||||
| * | Update conformance failure lists. | Feng Xiao | 2016-11-18 | 2 | -12/+0 |
| | | |||||
| * | Add back missing LIBPROTOBUF_EXPORT. | Feng Xiao | 2016-11-17 | 1 | -1/+1 |
| | | |||||
| * | Updated libprotoc.cmake | Adam Cozzette | 2016-11-17 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into down-integrate-with-msvc-fix | Adam Cozzette | 2016-11-17 | 82 | -759/+1668 |
| |\ | |||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 286 | -13531/+15271 |
| | | | |||||
* | | | Merge pull request #2404 from wiktortomczak/master | Feng Xiao | 2016-11-22 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | Support grpc plugin in py_proto_library | ||||
| * | | | Support grpc plugin in py_proto_library | Wiktor Tomczak | 2016-11-22 | 1 | -0/+12 |
|/ / / | |||||
* | | | Merge pull request #2398 from jbrianceau/no-static-init-define-fix | Feng Xiao | 2016-11-21 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER | ||||
| * | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER | Julien Brianceau | 2016-11-21 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | Behavior of define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER has been altered between 337a028 and cc8ca5b for C++. See github issue #2385 for further details. | ||||
* | | Merge pull request #2383 from snapsam/patch-1 | Adam Cozzette | 2016-11-17 | 1 | -1/+1 |
|\ \ | | | | | | | Update README.md | ||||
| * | | Update README.md | Samuel Rossoff (of The Ebon Blade) | 2016-11-17 | 1 | -1/+1 |
| | | | | | | | | | needed a grave here, not an apostrophy | ||||
* | | | Merge pull request #2382 from zhsyourai/master | Adam Cozzette | 2016-11-17 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Add LL to large constant | ||||
| * | | Add LL to large constant | zhsyourai | 2016-11-18 | 1 | -4/+4 |
|/ / | | | | | Some compiler will report: 'error: integer constant is too large for long type' | ||||
* | | Rename Empty to GPBEmpty in php generated file. | Paul Yang | 2016-11-16 | 8 | -8/+84 |
| | | | | | | | | In php, class name cannot be "Empty". Modified code generator to (#2375) generate GPBEmpty instead (for google.protobuf.Empty only). Also change runtime code to work with the new generated code accordingly. | ||||
* | | Merge pull request #2362 from wujingchao/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -2/+2 |
|\ \ | | | | | | | Class is final but declares protected field | ||||
| * | | Class is final but declares protected field | wujingchao | 2016-11-14 | 1 | -2/+2 |
| | | | | | | | | | This class is declared to be final, but declares fields to be protected. Since the class is final, it can not be derived from, and the use of protected is confusing. | ||||
* | | | Merge pull request #2378 from ianfhunter/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | typo in readme | ||||
| * | | | typo | Ian Hunter | 2016-11-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc | Adam Cozzette | 2016-11-16 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Add missing include in message_lite.cc | ||||
| * | | | Add missing include in message_lite.cc | Julien Brianceau | 2016-11-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error. | ||||
* | | | | Fix jenkins tests. | Feng Xiao | 2016-11-15 | 2 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #2323 from marcinwyszynski/master | Joshua Haberman | 2016-11-15 | 2 | -0/+54 |
|\ \ \ \ | | | | | | | | | | | More Ruby-eqsue interface | ||||
| * | | | | Move variable declarations before actual code | Marcin Wyszynski | 2016-11-14 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix copy pasta in test | Marcin Wyszynski | 2016-11-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More Ruby-eqsue interface | Marcin Wyszynski | 2016-11-03 | 2 | -0/+54 |
| | | | | | |||||
* | | | | | Merge pull request #1907 from evokly/js-utf8-fix | Joshua Haberman | 2016-11-15 | 3 | -18/+71 |
|\ \ \ \ \ | | | | | | | | | | | | | JS: Fix for high utf-8 codepoints. | ||||
| * | | | | | JS: Well, this is the right place for surrogates. | Wojciech Mandrysz | 2016-11-15 | 1 | -9/+11 |
| | | | | | | |||||
| * | | | | | JS: Re-added comment, moved surrogates code to the right place | Wojciech Mandrysz | 2016-11-15 | 2 | -9/+10 |
| | | | | | | |||||
| * | | | | | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because ↵ | Wojciech Mandrysz | 2016-10-10 | 3 | -18/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | of functions limited availability, fixed typo in tests. | ||||
| * | | | | | JS: Added string encoding/decoding tests for UTF-8 | Wojciech Mandrysz | 2016-10-03 | 1 | -0/+23 |
| | | | | | | |||||
| * | | | | | JS: Fixed UTF-8 string encoder/decoder for high codepoints. | Wojciech Mandrysz | 2016-10-03 | 2 | -15/+36 |
| | | | | | | |||||
* | | | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator | Feng Xiao | 2016-11-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix #include in js_generator.cc | ||||
| * | | | | | | Fix #include in js_generator.cc | Julien Brianceau | 2016-11-14 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99. |