aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update descriptor.proto's go_packageMichael Darakananda2016-12-073-8/+10
| | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-0610-41/+1058
|\ | | | | Add version number to plugin protocol.
| * Add version number to plugin protocol.Feng Xiao2016-12-0510-41/+1058
| |
* | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \ | | | | | | OpenBSD correct endianess handling
| * | when on OpenBSD we include the correct headers for endianess and check the ↵ramrunner2016-12-051-1/+5
| | | | | | | | | | | | apropriate defines
* | | Merge pull request #2442 from pherl/fix-bazelJisi Liu2016-12-052-0/+2
|\ \ \ | | | | | | | | Add missing files.
| * | | Add missing files.Jisi Liu2016-12-052-0/+2
|/ / /
* | / Factored Conformance and Benchmark test messages into shared test schema. ↵Joshua Haberman2016-12-0319-3878/+4032
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#1971) * Factored Conformance test messages into shared test schema. * Updated benchmarks to use new proto3 message locations. * Fixed include path. * Conformance: fixed include of Python test messages. * Make maven in Rakefile use --batch-mode. * Revert changes to benchmarks. On second thought I think a separate schema for CPU benchmarking makes sense. * Try regenerating C# protos for new test protos. * Removed benchmark messages from test proto. * Added Jon Skeet's fixes for C#. * Removed duplicate/old test messages C# file. * C# fixes for test schema move. * Fixed C# to use the correct TestAllTypes message. * Fixes for Objective C test schema move. * Added missing EXTRA_DIST file.
* | Merge pull request #2436 from cgrushko/patch-1Feng Xiao2016-12-021-0/+7
|\ \ | | | | | | Add a proto_lang_toolchain() for cc_proto_library
| * | Add a proto_lang_toolchain() for cc_proto_librarycgrushko2016-12-021-0/+7
|/ / | | | | | | | | | | | | | | | | Bazel's built-in cc_proto_library rule uses a proto_lang_toolchain to learn how to invoke proto-compiler. To use Bazel's cc_proto_library, add the following to your project's WORKSPACE file: local_repository( name = "com_google_protobuf_cc", path = "/path/to/protobuf-distribution/" )
* | Merge pull request #2431 from saintstack/2228v2Feng Xiao2016-12-022-5/+80
|\ \ | | | | | | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB to
| * | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Integer.MAX_SIZE (0x7FFFFFF) #2228 M java/core/src/main/java/com/google/protobuf/CodedInputStream.java Set DEFAULT_SIZE_LIMIT to Integer.MAX_SIZE (Was 64MB). This is how it was in pre-2.7.0 pb. Changed size check to an overflow-conscious test (as it is later in tryRefillBuffer (making sizeLimit a long was to disruptive). M java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java Add two tests that echo tests recently added over in c++ to test parse of message sizes that are approach and are beyond the size limit.
* | Generate phpdoc in php generated files. (#2406)Paul Yang2016-12-014-119/+1229
| |
* | Merge pull request #2429 from thomasvl/issue1833_swift_prefixThomas Van Lenten2016-11-304-198/+424
|\ \ | | | | | | Add a swift_prefix file option.
| * | Add a swift_prefix file option.Thomas Van Lenten2016-11-304-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-fixAdam Cozzette2016-11-23297-13691/+15542
|\ \ | | | | | | Integrated internal changes from Google
| * | 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
| |\ \
| * | | Integrated internal changes from GoogleAdam Cozzette2016-11-17286-13531/+15271
| | | |
* | | | Merge pull request #2404 from wiktortomczak/masterFeng Xiao2016-11-221-0/+12
|\ \ \ \ | | | | | | | | | | Support grpc plugin in py_proto_library
| * | | | Support grpc plugin in py_proto_libraryWiktor Tomczak2016-11-221-0/+12
|/ / / /
* | | | Merge pull request #2398 from jbrianceau/no-static-init-define-fixFeng Xiao2016-11-211-1/+1
|\ \ \ \ | |_|/ / |/| | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
| * | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERJulien Brianceau2016-11-211-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-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
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 20:52:01 +0000