aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #3722 from timou/cmake-windows-cleanGravatar Jisi Liu2017-10-27
|\ | | | | Suppress VS2017 compiler/linker warnings
* | Reserve unknown in Ruby (#3763)Gravatar Paul Yang2017-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Add missing filesGravatar Jisi Liu2017-10-26
| |
* | Merge pull request #3804 from pherl/mergeGravatar Jisi Liu2017-10-26
|\ \ | | | | | | Merge 3.4.x into master before cutting 3.5.x
* \ \ Merge pull request #3791 from signalwerk/patch-1Gravatar Adam Cozzette2017-10-26
|\ \ \ | | | | | | | | To be clear that we set a new variable
| | * | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-25
| |/| | |/| | |
* | | | Merge pull request #3787 from sergiocampama/coverageGravatar Thomas Van Lenten2017-10-24
|\ \ \ \ | | | | | | | | | | Improves coverage of GPBCodedInputStream
| * | | | Improves coverage of GPBCodedInputStreamGravatar Sergio Campama2017-10-24
|/ / / /
| * / / To be clear that we set a new variableGravatar Stefan Huber2017-10-24
|/ / /
| | * Sort MSVC warning suppressionsGravatar Tim Ebringer2017-10-21
| | | | | | | | | | | | Add brief documentation describing each warning suppression.
| * | Merge pull request #3758 from spinorx/3.4.xGravatar Jisi Liu2017-10-20
| |\ \ | | | | | | | | [v3.4.x branch] Fix iOS cc_library build for protobuf.
* | \ \ Merge pull request #3757 from spinorx/masterGravatar Jisi Liu2017-10-20
|\ \ \ \ | | | | | | | | | | Fix iOS cc_library build for protobuf.
* \ \ \ \ Merge pull request #3743 from Schtolc/masterGravatar Jisi Liu2017-10-19
|\ \ \ \ \ | | | | | | | | | | | | CodedInputStream::SetTotalBytesLimit description fix
* \ \ \ \ \ Merge pull request #3754 from toanju/gcc-fallthroughGravatar Jisi Liu2017-10-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix implicit fallthrough in gcc 7
* \ \ \ \ \ \ Merge pull request #3770 from pherl/3.5-integrateGravatar Jisi Liu2017-10-19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Integrate google internal changes for the up coming 3.5 release.
| * | | | | | | Fix Java 1.6 compileGravatar Jisi Liu2017-10-18
| | | | | | | |
* | | | | | | | Merge pull request #3751 from uykusuz/masterGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fixes issue #3750
| | | | | | * \ \ Merge pull request #3578 from pherl/filedeprecationGravatar Jisi Liu2017-10-18
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | Add @Deprecated annotation support for proto file.
* | | | | | | \ \ \ Merge pull request #3764 from zearen/patch-1Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add the proto-lens Haskell library to the 3rd party doc.
* \ \ \ \ \ \ \ \ \ \ Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirsGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | protobuf_generate: create include path only for proto files
| | | | | | | | * \ \ \ Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Gravatar Jisi Liu2017-10-18
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Clang warning cleanup for unused parameter.
* | | | | | | | | \ \ \ \ Merge pull request #3706 from johanbrandhorst/patch-1Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GopherJS protobuf and gRPC links
| | | | | * | | | | | | | | Fix JS conformance testsGravatar Jisi Liu2017-10-18
| | | | | | | | | | | | | |
| | | | | * | | | | | | | | Fix bazel buildGravatar Jisi Liu2017-10-18
| | | | | | | | | | | | | |
| | | | | * | | | | | | | | Update descriptor protosGravatar Jisi Liu2017-10-18
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3736 from jleni/fix_rbpiGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"
| | | | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2017-10-18
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Merge from google internalGravatar Jisi Liu2017-10-18
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3769 from pherl/io_win32Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Remove C++11 only usages in io_win32 tests.
| * | | | | | | | | | | | | | Fix unsiged underflowGravatar Jisi Liu2017-10-18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove C++11 only usages in io_win32 tests.Gravatar Jisi Liu2017-10-18
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ubGravatar Feng Xiao2017-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined memory management found by Clang's sanitizers.
| * | | | | | | | | | | | | | Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/google/protobuf/issues/3752 for context.
| | | | | | | | | | | | * / Fix iOS cc_library build for protobuf.Gravatar Param Reddy2017-10-15
| | | | | | | | | | |_|/ / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | * / | | | Fix iOS cc_library build for protobuf.Gravatar Param Reddy2017-10-15
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | * | | | | | fix implicit fallthrough in gcc 7Gravatar Tobias Jungel2017-10-15
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #3700
| | | | | * | | | | | fixes issue #3750Gravatar Boris Broenner2017-10-14
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In protobuf-module.cmake: in addition to checking for release or debug variants of protoc's location we should also check the configuration "noconfig".
* | | | | | | | | | Merge pull request #3744 from fmarier/json-escaping-namespaceGravatar Jisi Liu2017-10-13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move namespace closing brace inside the header guard block
| * | | | | | | | | | Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3739 from pherl/merge3.4Gravatar Jisi Liu2017-10-12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merge3.4
| | | | | | * | | | | CodedInputStream::SetTotalBytesLimit description fixGravatar Pavel2017-10-12
| |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix distcheckGravatar Jisi Liu2017-10-11
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|/| | | | | | | | | | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Converting to immutable hashable typesGravatar Juan Leni2017-10-11
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3735 from sgreenstein/patch-1Gravatar Feng Xiao2017-10-10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't pass -lpthread and -lm on Windows
| * | | | | | | | Don't pass -lpthread and -lm on WindowsGravatar Seth Greenstein2017-10-10
|/ / / / / / / / | | | | | | | | | | | | | | | | These flags are ignored by cl.exe and have no effect, but add noise to the build logs.
* | | | | | | | Reserve unknown fields in php (#3659)Gravatar Paul Yang2017-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * | | | Update third_party.mdGravatar Zearen Wover2017-10-09
| |_|_|/ / / / |/| | | | | |
| | | | | | * Suppress VS2017 compiler/linker warningsGravatar Tim Ebringer2017-10-06
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Add well known types to php runtime. (#3697)Gravatar Paul Yang2017-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 10:39:32 +0000