Commit Graph

5153 Commits

Author SHA1 Message Date
Jisi Liu
dedf9041c0 Merge pull request #3764 from zearen/patch-1
Add the proto-lens Haskell library to the 3rd party doc.
2017-10-18 15:28:37 -07:00
Jisi Liu
37f984f9df Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs
protobuf_generate: create include path only for proto files
2017-10-18 15:27:42 -07:00
Jisi Liu
3d6cc0e74b Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3
Clang warning cleanup for unused parameter.
2017-10-18 15:25:21 -07:00
Jisi Liu
2e2614e4c4 Merge pull request #3706 from johanbrandhorst/patch-1
Add GopherJS protobuf and gRPC links
2017-10-18 15:19:53 -07:00
Jisi Liu
188755c065 Fix JS conformance tests 2017-10-18 15:09:21 -07:00
Jisi Liu
1c682e0b0b Fix bazel build 2017-10-18 14:31:23 -07:00
Jisi Liu
ecf2957106 Update descriptor protos 2017-10-18 14:21:22 -07:00
Jisi Liu
30bfe36b6a Merge pull request #3736 from jleni/fix_rbpi
Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"
2017-10-18 12:56:04 -07:00
Jisi Liu
6b5912b1e3 Merge branch 'master' of github.com:google/protobuf 2017-10-18 12:22:28 -07:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Jisi Liu
dc9190f2f5 Merge pull request #3769 from pherl/io_win32
Remove C++11 only usages in io_win32 tests.
2017-10-18 11:58:59 -07:00
Jisi Liu
cc58be617d Fix unsiged underflow 2017-10-18 11:02:28 -07:00
Jisi Liu
7dbee32407 Remove C++11 only usages in io_win32 tests. 2017-10-18 10:48:10 -07:00
Feng Xiao
c4f59dcc5c Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ub
Fix undefined memory management found by Clang's sanitizers.
2017-10-16 13:21:31 -07:00
John Millikin
aff10976fc
Fix undefined memory management found by Clang's sanitizers.
See https://github.com/google/protobuf/issues/3752 for context.
2017-10-16 12:05:21 -07:00
Param Reddy
3130ce03fd Fix iOS cc_library build for protobuf.
The SDK and os versions were hard coded.  Archs were mixed up.
Because of this,  Was getting errors with latest SDK:
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
In file included from external/com_google_protobuf/src/google/protobuf/io/printer.cc:35:
In file included from external/com_google_protobuf/src/google/protobuf/io/printer.h:40:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string:470:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string_view:171:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__string:56:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/algorithm:638:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/cstring:61:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string.h:61:15: fatal error: 'string.h' file not found
              ^~~~~~~~~~
              1 error generated.

Currently none of these are needed when using bazel with https://github.com/bazelbuild/rules_apple.
-target arm64-apple-ios is passed properly to clang.  So -arch armv7 etc are not needed.
OS_IOS is not used anywhere.
Sources have:  GOOGLE_PROTOBUF_NO_THREADLOCAL defined in src/google/protobuf/stubs/platform_macros.h for iOS.  So __thread= is not needed.  In fact now that bazel is using C++11 by default,  __thread should ideally be moved to thread_local.
-miphoneos-version-min is passed by rules_apple.
2017-10-15 20:27:43 -07:00
Param Reddy
16792c6240 Fix iOS cc_library build for protobuf.
The SDK and os versions were hard coded.  Archs were mixed up.
Because of this,  Was getting errors with latest SDK:
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
clang: warning: no such sysroot directory: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/' [-Wmissing-sysroot]
In file included from external/com_google_protobuf/src/google/protobuf/io/printer.cc:35:
In file included from external/com_google_protobuf/src/google/protobuf/io/printer.h:40:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string:470:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string_view:171:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__string:56:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/algorithm:638:
In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/cstring:61:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/string.h:61:15: fatal error: 'string.h' file not found
              ^~~~~~~~~~
              1 error generated.

Currently none of these are needed when using bazel with https://github.com/bazelbuild/rules_apple.
-target arm64-apple-ios is passed properly to clang.  So -arch armv7 etc are not needed.
OS_IOS is not used anywhere.
Sources have:  GOOGLE_PROTOBUF_NO_THREADLOCAL defined in src/google/protobuf/stubs/platform_macros.h for iOS.  So __thread= is not needed.  In fact now that bazel is using C++11 by default,  __thread should ideally be moved to thread_local.
-miphoneos-version-min is passed by rules_apple.
2017-10-15 20:20:52 -07:00
Tobias Jungel
37e112f456 fix implicit fallthrough in gcc 7
fixes #3700
2017-10-15 01:31:18 +02:00
Boris Broenner
be13314b2a fixes issue #3750
In protobuf-module.cmake: in addition to checking for release or debug
variants of protoc's location we should also check the configuration "noconfig".
2017-10-14 00:41:40 +02:00
Jisi Liu
f850188e6e Merge pull request #3744 from fmarier/json-escaping-namespace
Move namespace closing brace inside the header guard block
2017-10-13 13:18:42 -07:00
Francois Marier
5992e24e8a
Move namespace closing brace inside the header guard block 2017-10-12 13:54:53 -07:00
Jisi Liu
a632f0dbac Merge pull request #3739 from pherl/merge3.4
Merge3.4
2017-10-12 11:02:57 -07:00
Pavel
38fd94e184 CodedInputStream::SetTotalBytesLimit description fix 2017-10-12 15:00:19 +03:00
Jisi Liu
dd980ccf57 Fix distcheck 2017-10-11 15:10:54 -07:00
Jisi Liu
de15e73d58 Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-11 14:44:03 -07:00
Juan Leni
08334f0908 Converting to immutable hashable types 2017-10-11 06:46:25 +02:00
Feng Xiao
c4083bb3d1 Merge pull request #3735 from sgreenstein/patch-1
Don't pass -lpthread and -lm on Windows
2017-10-10 11:11:36 -07:00
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.
2017-10-10 11:08:27 -07:00
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
2017-10-09 12:39:13 -07:00
Zearen Wover
d2a5f8b31d Update third_party.md 2017-10-09 14:39:06 -04:00
Tim Ebringer
2a72840425 Suppress VS2017 compiler/linker warnings
VS2017 warns about a few additional things, for example, files that
define no symbols (which is typically the result of a platform specific
ifdef not applying on Windows).

Suppress these warnings so the build is clean on VS2017.
2017-10-06 15:56:30 -04:00
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
2017-10-05 21:03:57 -07:00
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
2017-10-03 17:28:49 -07:00
Thomas Van Lenten
d6c32a818f Merge pull request #3714 from thomasvl/objc_increase_test_coverage
Objc increase test coverage
2017-10-03 13:43:50 -04:00
Thomas Van Lenten
a274c67caf Build out more complete code coverage in the tests. 2017-10-03 11:54:44 -04:00
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
Johan Brandhorst
fc7a6a2931 Add GopherJS protobuf and gRPC links
Add a link to my third party protobuf/gRPC implementation for GopherJS.
2017-10-02 21:48:34 +01:00
Jisi Liu
bd798dfc81 Merge pull request #3690 from pherl/3.4.x
Remove ranged based for in io_win32.cc
2017-10-02 10:53:06 -07:00
Jisi Liu
a38f876d40 Merge pull request #3691 from pherl/stringback
Fix C++11 string accessors
2017-09-29 10:24:32 -07:00
Markus Heß
f7e209951e protobuf_generate: create include path only for proto files 2017-09-29 11:07:36 +02:00
Jisi Liu
d2738c04f5 Add spaces 2017-09-27 10:56:19 -07:00
Jisi Liu
5a501c64c7 Fix C++11 string accessors 2017-09-27 10:33:04 -07:00
Jisi Liu
6d0cf1b3fe Remove ranged based for in io_win32.cc 2017-09-27 10:27:58 -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