aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Updated descriptor_pool.py to be compatible with Python 3Gravatar Adam Cozzette2016-11-22
| | | | | 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 codeGravatar Adam Cozzette2016-11-22
| | | | | | 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.6Gravatar Adam Cozzette2016-11-22
| | | | | 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 testGravatar Adam Cozzette2016-11-22
| | | | | A new test is now passing and so we can remove it from the failure whitelist.
* Merge pull request #2400 from acozzette/jspb-test-fixesGravatar Adam Cozzette2016-11-22
|\ | | | | Fixed JSPB test failures
| * Added back in binary serialization round-trip in message_test.jsGravatar Adam Cozzette2016-11-21
| |
* | Merge pull request #2392 from xfxyjwf/fixdownGravatar Feng Xiao2016-11-21
|\ \ | | | | | | Restore jenkins files.
| | * Fixed remaining JSPB test failuresGravatar Adam Cozzette2016-11-21
| | |
| | * Updated message_test.js so that it does not depend on fromObjectGravatar Adam Cozzette2016-11-21
| | |
| | * Updated enum names in test.proto to avoid conflicting with testbinary.protoGravatar Adam Cozzette2016-11-21
| |/ |/|
| * Restore jenkins files.Gravatar Feng Xiao2016-11-18
|/ | | | | | | | 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.Gravatar Feng Xiao2016-11-18
|
* Update conformance failure lists.Gravatar Feng Xiao2016-11-18
|
* Add back missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-11-17
|
* Updated libprotoc.cmakeGravatar Adam Cozzette2016-11-17
|
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| |
| * Merge pull request #2383 from snapsam/patch-1Gravatar Adam Cozzette2016-11-17
| |\ | | | | | | Update README.md
| * \ Merge pull request #2382 from zhsyourai/masterGravatar Adam Cozzette2016-11-17
| |\ \ | | | | | | | | Add LL to large constant
| | | * Update README.mdGravatar Samuel Rossoff (of The Ebon Blade)2016-11-17
| | |/ | |/| | | | needed a grave here, not an apostrophy
| | * Add LL to large constantGravatar zhsyourai2016-11-18
| |/ | | | | Some compiler will report: 'error: integer constant is too large for long type'
| * Rename Empty to GPBEmpty in php generated file.Gravatar Paul Yang2016-11-16
| | | | | | | | 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-1Gravatar Adam Cozzette2016-11-16
| |\ | | | | | | Class is final but declares protected field
| * \ Merge pull request #2378 from ianfhunter/patch-1Gravatar Adam Cozzette2016-11-16
| |\ \ | | | | | | | | typo in readme
| * \ \ Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccGravatar Adam Cozzette2016-11-16
| |\ \ \ | | | | | | | | | | Add missing include in message_lite.cc
| | | * | typoGravatar Ian Hunter2016-11-16
| | |/ / | |/| |
| * | | Fix jenkins tests.Gravatar Feng Xiao2016-11-15
| | | |
| * | | Merge pull request #2323 from marcinwyszynski/masterGravatar Joshua Haberman2016-11-15
| |\ \ \ | | | | | | | | | | More Ruby-eqsue interface
| * \ \ \ Merge pull request #1907 from evokly/js-utf8-fixGravatar Joshua Haberman2016-11-15
| |\ \ \ \ | | | | | | | | | | | | JS: Fix for high utf-8 codepoints.
| | * | | | JS: Well, this is the right place for surrogates.Gravatar Wojciech Mandrysz2016-11-15
| | | | | |
| | * | | | JS: Re-added comment, moved surrogates code to the right placeGravatar Wojciech Mandrysz2016-11-15
| | | | | |
| * | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorGravatar Feng Xiao2016-11-14
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix #include in js_generator.cc
| * \ \ \ \ \ Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonGravatar Feng Xiao2016-11-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix csharp/src/Google.Protobuf.Test/project.json
| | * | | | | | Fix csharp/src/Google.Protobuf.Test/project.jsonGravatar Julien Brianceau2016-11-14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the following Chromium presubmit error: third_party/protobuf/csharp/src/Google.Protobuf.Test/project.json could not be parsed: Expecting property name: line 25 column 3 (char 482)
| | | | | * / Add missing include in message_lite.ccGravatar Julien Brianceau2016-11-14
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
| | * | | | Fix #include in js_generator.ccGravatar Julien Brianceau2016-11-14
| |/ / / / | | | | | | | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99.
| | | * | Move variable declarations before actual codeGravatar Marcin Wyszynski2016-11-14
| | | | |
| * | | | Merge pull request #2364 from haberman/jslicenseGravatar Joshua Haberman2016-11-14
| |\ \ \ \ | | | | | | | | | | | | Fixed JavaScript license declaration.
| | * | | | Fixed JavaScript license declaration.Gravatar Josh Haberman2016-11-14
| |/ / / /
| | | | * Class is final but declares protected fieldGravatar wujingchao2016-11-14
| | |_|/ | |/| | | | | | 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 #2358 from ckennelly/masterGravatar Feng Xiao2016-11-11
| |\ \ \ | | | | | | | | | | Resolve old TODO for StringTypeHandler.
| | * | | Resolve old TODO for StringTypeHandler.Gravatar Chris Kennelly2016-11-11
| |/ / / | | | | | | | | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd.
| * | | Merge pull request #2353 from guptasu/masterGravatar Feng Xiao2016-11-11
| |\ \ \ | | | | | | | | | | MessageOptions should handle both proto2 and google.protobuf package names.
| * \ \ \ Merge pull request #2357 from D3Hunter/masterGravatar Feng Xiao2016-11-11
| |\ \ \ \ | | | | | | | | | | | | #2356 : fix ExceptionInInitializerError on IBM J9
| | * | | | #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| |/ / / /
| * | | | Fix php c extension on 32-bit machines. (#2348)Gravatar Paul Yang2016-11-10
| | | | |
| * | | | Merge pull request #2337 from sergiocampama/deprecationGravatar Feng Xiao2016-11-10
| |\ \ \ \ | | | | | | | | | | | | Fixes deprecation warnings/errors on Xcode
| | | * | | Made helper code also consider package name 'proto2' when dealing with ↵Gravatar guptasu2016-11-10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
| | * | | Fixing references to the removed atomicops_internals_pnacl.h file.Gravatar Sergio Campama2016-11-10
| | | | |
| * | | | Merge pull request #2332 from Kwizatz/masterGravatar Adam Cozzette2016-11-09
| |\ \ \ \ | | | | | | | | | | | | Added explicit cast to avoid size warning on Win64.