aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed Ruby tests for JRuby 1.7Adam Cozzette2016-11-231-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 3Adam Cozzette2016-11-221-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 codeAdam Cozzette2016-11-2221-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.6Adam Cozzette2016-11-221-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 testAdam Cozzette2016-11-221-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-fixesAdam Cozzette2016-11-227-10/+16
|\ | | | | Fixed JSPB test failures
| * Added back in binary serialization round-trip in message_test.jsAdam Cozzette2016-11-211-0/+7
| |
| * Fixed remaining JSPB test failuresAdam Cozzette2016-11-215-5/+10
| |
| * Updated message_test.js so that it does not depend on fromObjectAdam Cozzette2016-11-211-7/+1
| |
| * Updated enum names in test.proto to avoid conflicting with testbinary.protoAdam Cozzette2016-11-211-3/+3
| |
* | Merge pull request #2392 from xfxyjwf/fixdownFeng Xiao2016-11-214-18/+60
|\ \ | |/ |/| Restore jenkins files.
| * Restore jenkins files.Feng Xiao2016-11-184-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 Xiao2016-11-182-1/+4
|
* Update conformance failure lists.Feng Xiao2016-11-182-12/+0
|
* Add back missing LIBPROTOBUF_EXPORT.Feng Xiao2016-11-171-1/+1
|
* Updated libprotoc.cmakeAdam Cozzette2016-11-171-0/+1
|
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1782-759/+1668
|\
| * Merge pull request #2383 from snapsam/patch-1Adam Cozzette2016-11-171-1/+1
| |\ | | | | | | Update README.md
| | * Update README.mdSamuel Rossoff (of The Ebon Blade)2016-11-171-1/+1
| | | | | | | | | needed a grave here, not an apostrophy
| * | Merge pull request #2382 from zhsyourai/masterAdam Cozzette2016-11-171-4/+4
| |\ \ | | |/ | |/| Add LL to large constant
| | * Add LL to large constantzhsyourai2016-11-181-4/+4
| |/ | | | | Some compiler will report: 'error: integer constant is too large for long type'
| * Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-168-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-1Adam Cozzette2016-11-161-2/+2
| |\ | | | | | | Class is final but declares protected field
| | * Class is final but declares protected fieldwujingchao2016-11-141-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-1Adam Cozzette2016-11-161-1/+1
| |\ \ | | | | | | | | typo in readme
| | * | typoIan Hunter2016-11-161-1/+1
| | | |
| * | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccAdam Cozzette2016-11-161-0/+1
| |\ \ \ | | |/ / | |/| | Add missing include in message_lite.cc
| | * | Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
| * | | Fix jenkins tests.Feng Xiao2016-11-152-1/+5
| | | |
| * | | Merge pull request #2323 from marcinwyszynski/masterJoshua Haberman2016-11-152-0/+54
| |\ \ \ | | | | | | | | | | More Ruby-eqsue interface
| | * | | Move variable declarations before actual codeMarcin Wyszynski2016-11-141-2/+2
| | | | |
| | * | | Fix copy pasta in testMarcin Wyszynski2016-11-031-1/+1
| | | | |
| | * | | More Ruby-eqsue interfaceMarcin Wyszynski2016-11-032-0/+54
| | | | |
| * | | | Merge pull request #1907 from evokly/js-utf8-fixJoshua Haberman2016-11-153-18/+71
| |\ \ \ \ | | | | | | | | | | | | JS: Fix for high utf-8 codepoints.
| | * | | | JS: Well, this is the right place for surrogates.Wojciech Mandrysz2016-11-151-9/+11
| | | | | |
| | * | | | JS: Re-added comment, moved surrogates code to the right placeWojciech Mandrysz2016-11-152-9/+10
| | | | | |
| | * | | | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because ↵Wojciech Mandrysz2016-10-103-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | of functions limited availability, fixed typo in tests.
| | * | | | JS: Added string encoding/decoding tests for UTF-8Wojciech Mandrysz2016-10-031-0/+23
| | | | | |
| | * | | | JS: Fixed UTF-8 string encoder/decoder for high codepoints.Wojciech Mandrysz2016-10-032-15/+36
| | | | | |
| * | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generatorFeng Xiao2016-11-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix #include in js_generator.cc
| | * | | | | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99.
| * | | | | Merge pull request #2368 from jbrianceau/fix-json-style-in-project-jsonFeng Xiao2016-11-141-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix csharp/src/Google.Protobuf.Test/project.json
| | * | | | Fix csharp/src/Google.Protobuf.Test/project.jsonJulien Brianceau2016-11-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | Merge pull request #2364 from haberman/jslicenseJoshua Haberman2016-11-141-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | Fixed JavaScript license declaration.
| | * | | Fixed JavaScript license declaration.Josh Haberman2016-11-141-1/+1
| |/ / /
| * | | Merge pull request #2358 from ckennelly/masterFeng Xiao2016-11-111-15/+1
| |\ \ \ | | | | | | | | | | Resolve old TODO for StringTypeHandler.
| | * | | Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
| |/ / / | | | | | | | | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd.
| * | | Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
| |\ \ \ | | | | | | | | | | MessageOptions should handle both proto2 and google.protobuf package names.
| | * | | Made helper code also consider package name 'proto2' when dealing with ↵guptasu2016-11-103-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
| * | | | Merge pull request #2357 from D3Hunter/masterFeng Xiao2016-11-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | #2356 : fix ExceptionInInitializerError on IBM J9
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 19:00:55 +0000