Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Build out more complete code coverage in the tests. | Thomas Van Lenten | 2017-10-03 | 5 | -36/+494 |
| | |||||
* | Let Xcode 9 update project/scheme settings. | Thomas Van Lenten | 2017-10-03 | 6 | -6/+30 |
| | |||||
* | Merge pull request #3710 from thomasvl/xcode9 | Thomas Van Lenten | 2017-10-02 | 1 | -0/+6 |
|\ | | | | | Add Xcode 9 support to the helper script. | ||||
| * | Add Xcode 9 support to the helper script. | Thomas Van Lenten | 2017-10-02 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #3709 from thomasvl/unknown_field_merge_issue | Thomas Van Lenten | 2017-10-02 | 2 | -11/+21 |
|\ \ | |/ |/| | ObjC: Fix merging of length delimited unknown fields. | ||||
| * | ObjC: Fix merging of length delimited unknown fields. | Thomas Van Lenten | 2017-10-02 | 2 | -11/+21 |
|/ | | | | | - 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) | Bruce Dawson | 2017-10-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | * 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 #3676 from hesmar/hesmar/fixProtobufGeneratePython | Feng Xiao | 2017-09-25 | 1 | -2/+2 |
|\ | | | | | generate python code when calling PROTOBUF_GENERATE_PYTHON | ||||
| * | generate python code when calling PROTOBUF_GENERATE_PYTHON | Markus Heß | 2017-09-25 | 1 | -2/+2 |
|/ | |||||
* | Enforce all error report for php tests. (#3670) | Paul Yang | 2017-09-22 | 5 | -5/+25 |
| | | | | | | * Enforce all error report for php tests. * Import vendor/autoload.php in tests/bootstrap_phpunit.php | ||||
* | Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExport | Feng Xiao | 2017-09-22 | 2 | -4/+11 |
|\ | | | | | protobuf_generate: add EXPORT_MACRO option | ||||
| * | protobuf_generate: add EXPORT_MACRO option | Markus Heß | 2017-09-22 | 2 | -4/+11 |
|/ | |||||
* | Merge pull request #3674 from pherl/shutdown | Jisi Liu | 2017-09-21 | 1 | -0/+2 |
|\ | | | | | Test Shutdown can be called multiple times. | ||||
| * | Test Shutdown can be called multiple times. | Jisi Liu | 2017-09-21 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #3627 from zanker/zanker/add-submsg-hash-init | Joshua Haberman | 2017-09-21 | 5 | -26/+116 |
|\ \ | |/ |/| | Allow initializing a chain of protos using only a hash in Ruby | ||||
| * | Update message.c | Zachary Anker | 2017-09-21 | 1 | -2/+1 |
| | | |||||
| * | Allow initializing a chain of protos using only a hash | Zachary Anker | 2017-09-20 | 5 | -26/+117 |
| | | |||||
* | | Add $ before url_prefix_len to make it a variable. (#3668) | Paul Yang | 2017-09-20 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | * 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_h | Joshua Haberman | 2017-09-20 | 3 | -3/+22 |
|\ \ | | | | | | | Fixed to_h with repeated messages to return hashes in Ruby | ||||
| * | | Update message.c | Zachary Anker | 2017-09-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed to_h with repeated messages to return hashes in Ruby | Zachary Anker | 2017-09-20 | 3 | -3/+22 |
| | | | |||||
* | | | Merge pull request #2377 from mcos/chore/conformance-null-tests | Feng Xiao | 2017-09-19 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | Conformance Tests for Null Timestamp and Duration JSON Values | ||||
| * | | | Add tests to demonstrate json parsing for null Timestamp and Duration types | Mark Costello | 2016-11-16 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge pull request #3624 from acozzette/down-integrate | Adam Cozzette | 2017-09-18 | 173 | -13998/+14541 |
|\ \ \ \ | |_|/ / |/| | | | Integrated internal changes from Google | ||||
| * | | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 173 | -13998/+14541 |
|/ / / | |||||
* | | | Merge pull request #3626 from xfxyjwf/fixgo | Feng Xiao | 2017-09-13 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | Fix go example test. | ||||
| * | | | Fix go example test. | Feng Xiao | 2017-09-13 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | It needs "-I" flag to find imported file google/protobuf/timestamp.proto | ||||
* | | | | Merge pull request #3635 from drivehappy/clang_cleanup | Feng Xiao | 2017-09-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Clang warning cleanup for unused parameter. | ||||
| * | | | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-13 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3158 from yeswalrus/fix-policy-warning | Feng Xiao | 2017-09-13 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fix policy warning CMP0054 | ||||
| * | | | Fix policy warning CMP0054 | Walter Gray | 2017-05-30 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #3621 from jtattermusch/upport_3596 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Google.Protobuf should target net45 (upport to upstream/master) | ||||
| * | | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3618 from hesmar/fix_protobuf_generate | Feng Xiao | 2017-09-12 | 1 | -7/+12 |
|\ \ \ \ | |/ / / |/| | | | fix protobuf_generate function | ||||
| * | | | fix protobuf_generate function | Markus Heß | 2017-09-12 | 1 | -7/+12 |
| | | | | |||||
* | | | | Merge pull request #3613 from xfxyjwf/bazel_examples | Feng Xiao | 2017-09-11 | 14 | -89/+352 |
|\ \ \ \ | |/ / / |/| | | | Add bazel support for examples. | ||||
| * | | | Exclude addressbook.proto from C# boostrap test. | Feng Xiao | 2017-09-11 | 2 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target. | ||||
| * | | | Update C# generated file for addressbook.proto | Feng Xiao | 2017-09-11 | 1 | -11/+47 |
| | | | | |||||
| * | | | Update examples file list. | Feng Xiao | 2017-09-11 | 1 | -6/+7 |
| | | | | |||||
| * | | | Add bazel support for examples. | Feng Xiao | 2017-09-08 | 10 | -66/+298 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example utilizes native bazel rules (proto_library, cc_proto_library, java_proto_library, java_lite_proto_library) to show how easy it is to build protobuf with bazel's native support. It also makes use of well known types which was not possible until the latest bazel 0.5.4 release and https://github.com/google/protobuf/pull/3594 . | ||||
* | | | | Add well-known timestamps to JSON for PHP (#3564) | Jack Wakefield | 2017-09-10 | 6 | -61/+146 |
|/ / / | |||||
* | | | Merge pull request #2576 from cristicbz/py-strutil | Feng Xiao | 2017-09-08 | 1 | -1/+11 |
|\ \ \ | | | | | | | | | python: do not include internal 'strutil.h' header | ||||
| * | | | python: do not include internal 'strutil.h' header | Cristi Cobzarenco | 2017-01-28 | 1 | -1/+11 |
| | | | | |||||
* | | | | Merge pull request #3590 from NanXiao/patch-1 | Adam Cozzette | 2017-09-06 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Update autogen.sh | ||||
| * | | | | Update autogen.sh | Nan Xiao | 2017-09-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug in following scenario: gmock is downloaded successfully while gtest not. Resuming "autogen.sh", the gtest won't be downloaded. And following error will occur: $ ./autogen.sh + autoreconf -f -i -Wall,no-obsolete aclocal: error: configure.ac:1: file 'gtest/m4/acx_pthread.m4' does not exist autoreconf: aclocal failed with exit status: 1 | ||||
* | | | | | Add native php support for Duration. (#3583) | Paul Yang | 2017-09-05 | 7 | -0/+261 |
| | | | | | |||||
* | | | | | Merge pull request #3594 from buchgr/well-known-protos | Feng Xiao | 2017-09-05 | 2 | -15/+47 |
|\ \ \ \ \ | |/ / / / |/| | | | | bazel: Add proto_library rules for well known types. Fixes #2763 | ||||
| * | | | | bazel: Add proto_library rules for well known types. Fixes #2763 | Jakob Buchgraber | 2017-09-05 | 2 | -15/+47 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a proto_library rule for each well known type proto: $ bazel query "filter(\".*_proto$\", \"...\")" //:wrappers_proto //:timestamp_proto //:struct_proto //:field_mask_proto //:empty_proto //:duration_proto //:compiler_plugin_proto //:descriptor_proto //:api_proto //:type_proto //:source_context_proto //:any_proto Bazel users can reference these proto_library rules for their own language specific rules i.e. java_proto_library( name = "any_java_proto", deps = ["@com_google_protobuf//:any_proto"], ) Also set the workspace name to "com_google_protobuf", as proto_library rules reference protobuf that way. | ||||
* | | | | Merge pull request #3560 from tenderlove/thread-safe-map | Joshua Haberman | 2017-08-31 | 5 | -23/+37 |
|\ \ \ \ | | | | | | | | | | | Move parse frame array to the Map object | ||||
| * | | | | Storing the frame on the map means we don't need the array | Aaron Patterson | 2017-08-30 | 3 | -14/+9 |
| | | | | |