aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Fix bazel buildGravatar Jisi Liu2017-10-18
|
* Update descriptor protosGravatar Jisi Liu2017-10-18
|
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2017-10-18
|\
* | Merge from google internalGravatar Jisi Liu2017-10-18
| |
| * Merge pull request #3769 from pherl/io_win32Gravatar Jisi Liu2017-10-18
|/| | | | | Remove C++11 only usages in io_win32 tests.
| * Fix unsiged underflowGravatar Jisi Liu2017-10-18
| |
| * Remove C++11 only usages in io_win32 tests.Gravatar Jisi Liu2017-10-18
|/
* Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ubGravatar Feng Xiao2017-10-16
|\ | | | | Fix undefined memory management found by Clang's sanitizers.
| * Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
|/ | | | See https://github.com/google/protobuf/issues/3752 for context.
* Merge pull request #3744 from fmarier/json-escaping-namespaceGravatar Jisi Liu2017-10-13
|\ | | | | Move namespace closing brace inside the header guard block
| * Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
|/
* Merge pull request #3739 from pherl/merge3.4Gravatar Jisi Liu2017-10-12
|\ | | | | Merge3.4
| * Fix distcheckGravatar Jisi Liu2017-10-11
| |
| * Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|/|
* | Merge pull request #3735 from sgreenstein/patch-1Gravatar Feng Xiao2017-10-10
|\ \ | | | | | | Don't pass -lpthread and -lm on Windows
| * | Don't pass -lpthread and -lm on WindowsGravatar Seth Greenstein2017-10-10
|/ / | | | | These flags are ignored by cl.exe and have no effect, but add noise to the build logs.
* | Reserve unknown fields in php (#3659)Gravatar Paul Yang2017-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown fields in upb 1) For decoding, an unknownfields will be lazily created on message, which contains bytes of unknown fields. 2) For encoding, if the unknownfields is present on message, all bytes contained in it will be serialized. * Register the function to encode unknown field at decode time. * Remove upb_handlers_setaddunknown * Use upb_sink_putunknown in decoder * Remove upb_pb_encoder_encode_unknown * Do not expose encode_unknown * Implement reserve unknown field in php Implement. * Make buffer private to CodedInputStream
* | Add well known types to php runtime. (#3697)Gravatar Paul Yang2017-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add well known types to php runtime. * Fix php7.0 tests * No longer generate empty.proto in test as it has been included in runtime. * Fix zts build * Clean code * Rename g_p_b_empty to empty. * Don't generate code for empty.proto in compatibility test * Fix 32-bit * Fix mac build * Fix Makefile.am to add new files
* | Fix ruby segment fault (#3708)Gravatar Paul Yang2017-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix ruby segment fault 1) rb_ary_new cannot be called during allocate function. During allocate fucntion, the containing object hasn't been marked and rb_ary_new may invoke gc to collect containing object. 2) The global map should be marked before allocating it. Otherwise it may be garbage collected. * Add test * Remove commented code * Fix grammer error
* | Merge pull request #3714 from thomasvl/objc_increase_test_coverageGravatar Thomas Van Lenten2017-10-03
|\ \ | | | | | | Objc increase test coverage
| * | Build out more complete code coverage in the tests.Gravatar Thomas Van Lenten2017-10-03
| | |
| * | Let Xcode 9 update project/scheme settings.Gravatar Thomas Van Lenten2017-10-03
|/ /
* | Merge pull request #3710 from thomasvl/xcode9Gravatar Thomas Van Lenten2017-10-02
|\ \ | | | | | | Add Xcode 9 support to the helper script.
* \ \ Merge pull request #3709 from thomasvl/unknown_field_merge_issueGravatar Thomas Van Lenten2017-10-02
|\ \ \ | | | | | | | | ObjC: Fix merging of length delimited unknown fields.
| | * | Add Xcode 9 support to the helper script.Gravatar Thomas Van Lenten2017-10-02
| |/ / |/| |
| * | ObjC: Fix merging of length delimited unknown fields.Gravatar Thomas Van Lenten2017-10-02
|/ / | | | | | | | | - Add a test to cover this and tweak the test to not use two merge paths to be sure things are as expected.
* | Use constexpr more with VC++ 2017 (#3707)Gravatar Bruce Dawson2017-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | * Use constexpr more with VC++ 2017 Chrome's official builds have over 170 dynamic initializers for variables of the form *::TableStruct::aux. Defining PROTOBUF_CONSTEXPR_VAR to be constexpr for VS 2017 gets rid of all of these and saves about 10 KB of binary size. * Update generated_message_table_driven.h Restore accidentally deleted line.
| * Merge pull request #3690 from pherl/3.4.xGravatar Jisi Liu2017-10-02
| |\ | | | | | | Remove ranged based for in io_win32.cc
| * \ Merge pull request #3691 from pherl/stringbackGravatar Jisi Liu2017-09-29
| |\ \ | | | | | | | | Fix C++11 string accessors
| | * | Add spacesGravatar Jisi Liu2017-09-27
| | | |
| | * | Fix C++11 string accessorsGravatar Jisi Liu2017-09-27
| |/ /
| | * Remove ranged based for in io_win32.ccGravatar Jisi Liu2017-09-27
| |/
* | Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePythonGravatar Feng Xiao2017-09-25
|\ \ | | | | | | generate python code when calling PROTOBUF_GENERATE_PYTHON
| * | generate python code when calling PROTOBUF_GENERATE_PYTHONGravatar Markus Heß2017-09-25
|/ /
* | Enforce all error report for php tests. (#3670)Gravatar Paul Yang2017-09-22
| | | | | | | | | | | | * Enforce all error report for php tests. * Import vendor/autoload.php in tests/bootstrap_phpunit.php
* | Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExportGravatar Feng Xiao2017-09-22
|\ \ | | | | | | protobuf_generate: add EXPORT_MACRO option
| * | protobuf_generate: add EXPORT_MACRO optionGravatar Markus Heß2017-09-22
|/ /
* | Merge pull request #3674 from pherl/shutdownGravatar Jisi Liu2017-09-21
|\ \ | | | | | | Test Shutdown can be called multiple times.
* \ \ Merge pull request #3627 from zanker/zanker/add-submsg-hash-initGravatar Joshua Haberman2017-09-21
|\ \ \ | | | | | | | | Allow initializing a chain of protos using only a hash in Ruby
| | * | Test Shutdown can be called multiple times.Gravatar Jisi Liu2017-09-21
| |/ / |/| |
| * | Update message.cGravatar Zachary Anker2017-09-21
| | |
* | | Add $ before url_prefix_len to make it a variable. (#3668)Gravatar Paul Yang2017-09-20
| | | | | | | | | | | | | | | | | | | | | | | | * Add $ before url_prefix_len to make it a variable. * Remove unnecessary string length check * Remove useless $type_url_len
* | | Merge pull request #3639 from zanker/zanker/fix-embedded-to_hGravatar Joshua Haberman2017-09-20
|\ \ \ | | | | | | | | Fixed to_h with repeated messages to return hashes in Ruby
| * | | Update message.cGravatar Zachary Anker2017-09-20
| | | |
| | * | Allow initializing a chain of protos using only a hashGravatar Zachary Anker2017-09-20
| | | |
| * | | Fixed to_h with repeated messages to return hashes in RubyGravatar Zachary Anker2017-09-20
| | | |
* | | | Merge pull request #2377 from mcos/chore/conformance-null-testsGravatar Feng Xiao2017-09-19
|\ \ \ \ | | | | | | | | | | Conformance Tests for Null Timestamp and Duration JSON Values
* \ \ \ \ Merge pull request #3624 from acozzette/down-integrateGravatar Adam Cozzette2017-09-18
|\ \ \ \ \ | |_|/ / / |/| | | | Integrated internal changes from Google
| | | | * Merge pull request #3651 from pherl/3.4.xGravatar Jisi Liu2017-09-15
| | | | |\ | | | | | | | | | | | | Bumping minor version for ruby gems
| | | | | * Bumping minor version for ruby gemsGravatar Jisi Liu2017-09-15
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 18:15:14 +0000