AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,033 Commits 35 Branches 138 Tags 124 MiB
9477123538
Commit Graph

5033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Van Lenten
9477123538 Let Xcode 9 update project/scheme settings. 2017-10-03 09:56:02 -04:00
Thomas Van Lenten
4207066c35 Merge pull request #3710 from thomasvl/xcode9 
Add Xcode 9 support to the helper script.
 2017-10-02 20:14:50 -04:00
Thomas Van Lenten
c4dce018b2 Merge pull request #3709 from thomasvl/unknown_field_merge_issue 
ObjC: Fix merging of length delimited unknown fields.
 2017-10-02 20:14:12 -04:00
Thomas Van Lenten
b586e646a4 Add Xcode 9 support to the helper script. 2017-10-02 20:13:59 -04:00
Thomas Van Lenten
3f2dcaebe3 ObjC: Fix merging of length delimited unknown fields. 
- Add a test to cover this and tweak the test to not use two merge
  paths to be sure things are as expected.
 2017-10-02 19:56:25 -04:00
Bruce Dawson
210be267fd Use constexpr more with VC++ 2017 (#3707) 
* 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.
 2017-10-02 14:43:05 -07:00
Feng Xiao
fc5aa5d910 Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePython 
generate python code when calling PROTOBUF_GENERATE_PYTHON
 2017-09-25 10:39:31 -07:00
Markus Heß
0e069e5a2d generate python code when calling PROTOBUF_GENERATE_PYTHON 2017-09-25 11:08:12 +02:00
Paul Yang
ae55fd2cc5 Enforce all error report for php tests. (#3670) 
* Enforce all error report for php tests.

* Import vendor/autoload.php in tests/bootstrap_phpunit.php
 2017-09-22 14:08:01 -07:00
Feng Xiao
c20440222a Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExport 
protobuf_generate: add EXPORT_MACRO option
 2017-09-22 11:38:19 -07:00
Markus Heß
9829b8f511 protobuf_generate: add EXPORT_MACRO option 2017-09-22 11:44:59 +02:00
Jisi Liu
c627530946 Merge pull request #3674 from pherl/shutdown 
Test Shutdown can be called multiple times.
 2017-09-21 15:24:31 -07:00
Joshua Haberman
4fc75296c7 Merge pull request #3627 from zanker/zanker/add-submsg-hash-init 
Allow initializing a chain of protos using only a hash in Ruby
 2017-09-21 15:08:45 -07:00
Jisi Liu
b091bfb07b Test Shutdown can be called multiple times. 2017-09-21 14:08:01 -07:00
Zachary Anker
633ef8bde9 Update message.c 2017-09-21 09:26:54 -07:00
Paul Yang
2b0ee3fdf6 Add $ before url_prefix_len to make it a variable. (#3668) 
* Add $ before url_prefix_len to make it a variable.

* Remove unnecessary string length check

* Remove useless $type_url_len
 2017-09-20 22:59:13 -07:00
Joshua Haberman
eade82c836 Merge pull request #3639 from zanker/zanker/fix-embedded-to_h 
Fixed to_h with repeated messages to return hashes in Ruby
 2017-09-20 15:35:28 -07:00
Zachary Anker
8eae3fe6e9 Update message.c 2017-09-20 12:45:42 -07:00
Zachary Anker
87714836e3 Allow initializing a chain of protos using only a hash 2017-09-20 11:39:46 -07:00
Zachary Anker
83264bd160 Fixed to_h with repeated messages to return hashes in Ruby 2017-09-20 11:38:05 -07:00
Feng Xiao
cf1b29dec8 Merge pull request #2377 from mcos/chore/conformance-null-tests 
Conformance Tests for Null Timestamp and Duration JSON Values
 2017-09-19 22:35:27 -07:00
Adam Cozzette
fa5a69e73b Merge pull request #3624 from acozzette/down-integrate 
Integrated internal changes from Google
 2017-09-18 08:34:54 -07:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
d1bc27caef Merge pull request #3626 from xfxyjwf/fixgo 
Fix go example test.
 2017-09-13 17:57:10 -07:00
Feng Xiao
8136ccb296 Fix go example test. 
It needs "-I" flag to find imported file google/protobuf/timestamp.proto
 2017-09-13 17:04:13 -07:00
Feng Xiao
c0d88ae300 Merge pull request #3635 from drivehappy/clang_cleanup 
Clang warning cleanup for unused parameter.
 2017-09-13 16:40:01 -07:00
drivehappy
7f3ded663b Clang warning cleanup for unused parameter. 2017-09-13 16:10:35 -07:00
Feng Xiao
471b45e895 Merge pull request #3158 from yeswalrus/fix-policy-warning 
Fix policy warning CMP0054
 2017-09-13 15:15:04 -07:00
Jan Tattermusch
06aa8dc9e7 Merge pull request #3621 from jtattermusch/upport_3596 
Google.Protobuf should target net45 (upport to upstream/master)
 2017-09-12 22:46:52 +02:00
Feng Xiao
ed0a07eadd Merge pull request #3618 from hesmar/fix_protobuf_generate 
fix protobuf_generate function
 2017-09-12 11:09:02 -07:00
Jan Tattermusch
5de05654aa Google.Protobuf should target net45 2017-09-12 11:56:34 +02:00
Markus Heß
444aecd35a fix protobuf_generate function 2017-09-12 10:00:04 +02:00
Feng Xiao
b1befb08c0 Merge pull request #3613 from xfxyjwf/bazel_examples 
Add bazel support for examples.
 2017-09-11 18:19:06 -07:00
Feng Xiao
6945203300 Exclude addressbook.proto from C# boostrap test. 
This addressbook.proto now belongs to its own bazel pacakge and can't be
accessed in bazel protobuf_test target.
 2017-09-11 17:00:11 -07:00
Feng Xiao
49b31dc5f7 Update C# generated file for addressbook.proto 2017-09-11 14:43:14 -07:00
Feng Xiao
49b88af4a2 Update examples file list. 2017-09-11 12:48:53 -07:00
Jack Wakefield
174c82d8ce Add well-known timestamps to JSON for PHP (#3564) 2017-09-10 15:17:50 -07:00
Feng Xiao
74bf45f379 Add bazel support for examples. 
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 .
 2017-09-08 16:01:49 -07:00
Feng Xiao
2ad5c0a864 Merge pull request #2576 from cristicbz/py-strutil 
python: do not include internal 'strutil.h' header
 2017-09-08 10:23:14 -07:00
Adam Cozzette
054054c152 Merge pull request #3590 from NanXiao/patch-1 
Update autogen.sh
 2017-09-06 10:31:52 -07:00
Paul Yang
7f8b91f552 Add native php support for Duration. (#3583) 2017-09-05 14:10:32 -07:00
Feng Xiao
35b852f5b8 Merge pull request #3594 from buchgr/well-known-protos 
bazel: Add proto_library rules for well known types. Fixes #2763
 2017-09-05 14:09:36 -07:00
Jakob Buchgraber
699c0eb9cf bazel: Add proto_library rules for well known types. Fixes #2763 
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.
 2017-09-05 22:33:54 +02:00
Nan Xiao
f4ff17bb16 Update autogen.sh 
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
 2017-09-04 15:43:54 +08:00
Joshua Haberman
6699f2cf64 Merge pull request #3560 from tenderlove/thread-safe-map 
Move parse frame array to the Map object
 2017-08-31 11:36:05 -07:00
Paul Yang
b70e0fdf09 Add php support for Timestamp. (#3575) 
* Add php support for Timestamp.

* Fix comments
 2017-08-31 10:35:31 -07:00
Aaron Patterson
f55c6ec24f
Storing the frame on the map means we don't need the array 2017-08-30 11:38:09 -07:00
Aaron Patterson
d6152dd51c
Move parse frame array to the Map object 
This makes the frame stack per-parser, and per-thread.  Fixes #3250
 2017-08-30 11:38:04 -07:00
Paul Yang
c7457ef65a Add any support in php runtime. (#3486) 
* Add any support in php runtime.

* Remove unused file in config.m4

* Fix comments

* Fix error for tsrmls build

* Add newly added file to Makefile.am
 2017-08-25 08:49:34 -07:00
Jisi Liu
98a3734b5a Merge pull request #3503 from gburgessiv/master 
Work around a bug in clang's static analyzer
 2017-08-24 10:17:55 -07:00