Commit Graph

5131 Commits

Author SHA1 Message Date
Jisi Liu
c258fb303a
Merge pull request #3822 from mehrdada/update-benchmark-submodule
Update google/benchmark submodule to v1.2
2017-11-06 10:25:42 -08:00
Paul Yang
bcda919cee
Fix php well known type conformance tests (#3828)
* Fix php well known type conformance tests

* Properly generate code for test.proto

* Provide GPBMetadata files in c extensions for generated files to import.

* Remove unnecessary test

* Clean up code

* Add declaration for initOnce.

* Refactoring
2017-11-03 12:30:09 -07:00
Thomas Van Lenten
239dba535c
Merge pull request #3839 from thomasvl/message_equality
When comparing message, require them to have the same descriptor.
2017-11-03 12:54:28 -04:00
Thomas Van Lenten
1f57e540ac When comparing message, require them to have the same descriptor.
This will cover someone subclassing the message, and also handles
something crazy like someone comparing to a raw NSObject.
2017-11-03 12:49:28 -04:00
Jon Skeet
cbe250591f Fix merging with message-valued oneof
If messages A and B have the same oneof case, which is a message
type, and we merge B into A, those sub-messages should be merged.

Fixes #3200.

Note that I haven't regenerated all the code, as some of the protos
have been changed, breaking generation.
2017-10-31 17:11:40 -07:00
Mehrdad Afshari
bb35f04fe6 Update google/benchmark submodule to v1.2
Fixed some build issues on ppc64le architecture
2017-10-30 12:30:00 -07:00
Feng Xiao
6dd8224393
Merge pull request #3817 from xuwei-k/joda-url
update joda-time javadoc url
2017-10-30 12:12:20 -07:00
xuwei-k
05b56d01c1 update joda-time javadoc url 2017-10-30 17:48:54 +09:00
Jon Skeet
e8c9ae1209 Add parser settings WithXyz methods 2017-10-28 07:47:43 +01:00
Jon Skeet
a985451253 Add JsonParser setting to ignore unknown field values
Note that the default behavior is still to throw an exception; you
need to opt into ignoring unknown fields.

Fixes #2838.
2017-10-28 07:47:43 +01:00
Jisi Liu
4526d8baa0
Merge pull request #3722 from timou/cmake-windows-clean
Suppress VS2017 compiler/linker warnings
2017-10-27 12:37:30 -07:00
Paul Yang
23adfeb003 Reserve unknown in Ruby (#3763)
* Reserve unknown in ruby

* Revert ruby tests. Wait for cpp impl for conformance test

* Add conformance test for preserving unknown

* Add unknown field conformance test to csharp failure list.

* Fix comments

* Fix comment

* Fix comments

* Fix typo

* Use stringsink_string directly

* Mark hd unused

* Remove unused encodeunknown_handlerfunc
2017-10-26 14:41:43 -07:00
Jisi Liu
a08b03d4c0 Add missing files 2017-10-26 13:48:53 -07:00
Jisi Liu
9aaa8e1e55 Merge pull request #3804 from pherl/merge
Merge 3.4.x into master before cutting 3.5.x
2017-10-26 12:20:56 -07:00
Adam Cozzette
2fc7aea360 Merge pull request #3791 from signalwerk/patch-1
To be clear that we set a new variable
2017-10-26 10:10:20 -07:00
Jisi Liu
cdc0d9536a Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-25 14:43:07 -07:00
Thomas Van Lenten
ee8a0911cb Merge pull request #3787 from sergiocampama/coverage
Improves coverage of GPBCodedInputStream
2017-10-24 10:49:50 -04:00
Sergio Campama
b1f954e639 Improves coverage of GPBCodedInputStream 2017-10-24 10:44:41 -04:00
Stefan Huber
44daa59e53 To be clear that we set a new variable 2017-10-24 14:01:22 +02:00
Tim Ebringer
a23669c2f6 Sort MSVC warning suppressions
Add brief documentation describing each warning suppression.
2017-10-21 09:40:32 -04:00
Jisi Liu
cefa9d73e3 Merge pull request #3758 from spinorx/3.4.x
[v3.4.x branch] Fix iOS cc_library build for protobuf.
2017-10-20 11:56:31 -07:00
Jisi Liu
b189389e2f Merge pull request #3757 from spinorx/master
Fix iOS cc_library build for protobuf.
2017-10-20 11:56:13 -07:00
Jisi Liu
09e0dbcf8f Merge pull request #3743 from Schtolc/master
CodedInputStream::SetTotalBytesLimit description fix
2017-10-19 10:56:03 -07:00
Jisi Liu
2a14214045 Merge pull request #3754 from toanju/gcc-fallthrough
fix implicit fallthrough in gcc 7
2017-10-19 10:54:50 -07:00
Jisi Liu
07b9238a1c Merge pull request #3770 from pherl/3.5-integrate
Integrate google internal changes for the up coming 3.5 release.
2017-10-19 10:48:54 -07:00
Jisi Liu
2ee294d80b Fix Java 1.6 compile 2017-10-18 16:28:12 -07:00
Jisi Liu
9c407a16e4 Merge pull request #3751 from uykusuz/master
fixes issue #3750
2017-10-18 15:39:12 -07:00
Jisi Liu
ca6187d5e7 Merge pull request #3578 from pherl/filedeprecation
Add @Deprecated annotation support for proto file.
2017-10-18 15:33:31 -07:00
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