Jisi Liu
f850188e6e
Merge pull request #3744 from fmarier/json-escaping-namespace
...
Move namespace closing brace inside the header guard block
7 years ago
Francois Marier
5992e24e8a
Move namespace closing brace inside the header guard block
7 years ago
Jisi Liu
a632f0dbac
Merge pull request #3739 from pherl/merge3.4
...
Merge3.4
7 years ago
Jisi Liu
dd980ccf57
Fix distcheck
7 years ago
Jisi Liu
de15e73d58
Merge remote-tracking branch 'origin/3.4.x' into master
7 years ago
Feng Xiao
c4083bb3d1
Merge pull request #3735 from sgreenstein/patch-1
...
Don't pass -lpthread and -lm on Windows
7 years ago
Seth Greenstein
68ee916221
Don't pass -lpthread and -lm on Windows
...
These flags are ignored by cl.exe and have no effect, but add noise to the build logs.
7 years ago
Paul Yang
6032746882
Reserve unknown fields in php ( #3659 )
...
* 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
7 years ago
Paul Yang
77f64bb777
Add well known types to php runtime. ( #3697 )
...
* 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
7 years ago
Paul Yang
cd5f49d094
Fix ruby segment fault ( #3708 )
...
* 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
7 years ago
Thomas Van Lenten
d6c32a818f
Merge pull request #3714 from thomasvl/objc_increase_test_coverage
...
Objc increase test coverage
7 years ago
Thomas Van Lenten
a274c67caf
Build out more complete code coverage in the tests.
7 years ago
Thomas Van Lenten
9477123538
Let Xcode 9 update project/scheme settings.
7 years ago
Thomas Van Lenten
4207066c35
Merge pull request #3710 from thomasvl/xcode9
...
Add Xcode 9 support to the helper script.
7 years ago
Thomas Van Lenten
c4dce018b2
Merge pull request #3709 from thomasvl/unknown_field_merge_issue
...
ObjC: Fix merging of length delimited unknown fields.
7 years ago
Thomas Van Lenten
b586e646a4
Add Xcode 9 support to the helper script.
7 years ago
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.
7 years ago
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.
7 years ago
Jisi Liu
bd798dfc81
Merge pull request #3690 from pherl/3.4.x
...
Remove ranged based for in io_win32.cc
7 years ago
Jisi Liu
a38f876d40
Merge pull request #3691 from pherl/stringback
...
Fix C++11 string accessors
7 years ago
Jisi Liu
d2738c04f5
Add spaces
7 years ago
Jisi Liu
5a501c64c7
Fix C++11 string accessors
7 years ago
Jisi Liu
6d0cf1b3fe
Remove ranged based for in io_win32.cc
7 years ago
Feng Xiao
fc5aa5d910
Merge pull request #3676 from hesmar/hesmar/fixProtobufGeneratePython
...
generate python code when calling PROTOBUF_GENERATE_PYTHON
7 years ago
Markus Heß
0e069e5a2d
generate python code when calling PROTOBUF_GENERATE_PYTHON
7 years ago
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
7 years ago
Feng Xiao
c20440222a
Merge pull request #3675 from hesmar/hesmar/cmakeAddDllExport
...
protobuf_generate: add EXPORT_MACRO option
7 years ago
Markus Heß
9829b8f511
protobuf_generate: add EXPORT_MACRO option
7 years ago
Jisi Liu
c627530946
Merge pull request #3674 from pherl/shutdown
...
Test Shutdown can be called multiple times.
7 years ago
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
7 years ago
Jisi Liu
b091bfb07b
Test Shutdown can be called multiple times.
7 years ago
Zachary Anker
633ef8bde9
Update message.c
7 years ago
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
7 years ago
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
7 years ago
Zachary Anker
8eae3fe6e9
Update message.c
7 years ago
Zachary Anker
87714836e3
Allow initializing a chain of protos using only a hash
7 years ago
Zachary Anker
83264bd160
Fixed to_h with repeated messages to return hashes in Ruby
7 years ago
Feng Xiao
cf1b29dec8
Merge pull request #2377 from mcos/chore/conformance-null-tests
...
Conformance Tests for Null Timestamp and Duration JSON Values
7 years ago
Adam Cozzette
fa5a69e73b
Merge pull request #3624 from acozzette/down-integrate
...
Integrated internal changes from Google
7 years ago
Jisi Liu
655cc830d9
Merge pull request #3651 from pherl/3.4.x
...
Bumping minor version for ruby gems
7 years ago
Jisi Liu
2eb1bacc26
Bumping minor version for ruby gems
7 years ago
Paul Yang
5dd818cd22
Merge pull request #3612 from TeBoring/php-bug
...
Add prefix to php reserved keywords.
7 years ago
Jisi Liu
b04e5cba35
Merge pull request #3642 from pherl/3.4.x
...
Bump version for minor release
7 years ago
Jisi Liu
dba647a6b2
Bump version for minor release
7 years ago
Adam Cozzette
13fd045dbb
Integrated internal changes from Google
7 years ago
Feng Xiao
d1bc27caef
Merge pull request #3626 from xfxyjwf/fixgo
...
Fix go example test.
7 years ago
Feng Xiao
8136ccb296
Fix go example test.
...
It needs "-I" flag to find imported file google/protobuf/timestamp.proto
7 years ago
Feng Xiao
c0d88ae300
Merge pull request #3635 from drivehappy/clang_cleanup
...
Clang warning cleanup for unused parameter.
7 years ago
drivehappy
7f3ded663b
Clang warning cleanup for unused parameter.
7 years ago
Feng Xiao
471b45e895
Merge pull request #3158 from yeswalrus/fix-policy-warning
...
Fix policy warning CMP0054
7 years ago