aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* codereview cleanupDave MacLachlan2017-11-151-2/+2
|
* Reduce size of GPBDictionary by getting rid of class creation methodsDave MacLachlan2017-11-1411-4987/+410
|
* Remove non-C# options from C#-only test protosJon Skeet2017-11-1410-41/+13
|
* Merge pull request #3834 from sviterok/patch-1Jisi Liu2017-11-131-1/+1
|\ | | | | Fix a typo in WKT's test suite
| * Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
| | | | | | | | | | | | | | Hi! Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite: `"accpets" -> "accepts"` Thanks!
* | Update README.mdJisi Liu2017-11-131-4/+7
| |
* | Merge pull request #3875 from hchasestevens/add-hypothesis-protobuf-docFeng Xiao2017-11-131-0/+1
|\ \ | | | | | | Add hypothesis-protobuf library to the 3rd party doc.
| * | Add hypothesis-protobuf library to the 3rd party doc.H. Chase Stevens2017-11-131-0/+1
|/ /
* | MMinor fix-ups to C# tests from changes in earlier commitsJon Skeet2017-11-124-20/+30
| |
* | Regenerated test code for C#Jon Skeet2017-11-126-295/+330
| |
* | Move C#-only test protos to csharp/protosJon Skeet2017-11-128-28/+413
| | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
* | Run C# codegen when testing itJon Skeet2017-11-121-3/+5
| | | | | | | | | | This will cause failures if shared protos change in an incompatible way.
* | Merge pull request #3858 from jtattermusch/parsing_from_sliceJan Tattermusch2017-11-102-4/+44
|\ \ | | | | | | C#: Allow message parsing from an array slice
| * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-091-0/+14
| | |
| * | check already performed by MergeFromJan Tattermusch2017-11-091-5/+0
| | |
| * | allow message parsing from an array sliceJan Tattermusch2017-11-092-0/+31
|/ /
* | Merge pull request #3822 from mehrdada/update-benchmark-submoduleJisi Liu2017-11-061-0/+0
|\ \ | | | | | | Update google/benchmark submodule to v1.2
| * | Update google/benchmark submodule to v1.2Mehrdad Afshari2017-10-301-0/+0
| | | | | | | | | | | | Fixed some build issues on ppc64le architecture
* | | Fix php well known type conformance tests (#3828)Paul Yang2017-11-0312-164/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge pull request #3839 from thomasvl/message_equalityThomas Van Lenten2017-11-031-3/+4
|\ \ \ | |_|/ |/| | When comparing message, require them to have the same descriptor.
| * | When comparing message, require them to have the same descriptor.Thomas Van Lenten2017-11-031-3/+4
|/ / | | | | | | | | This will cover someone subclassing the message, and also handles something crazy like someone comparing to a raw NSObject.
* / Fix merging with message-valued oneofJon Skeet2017-10-3113-12/+417
|/ | | | | | | | | | 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.
* Merge pull request #3817 from xuwei-k/joda-urlFeng Xiao2017-10-304-4/+4
|\ | | | | update joda-time javadoc url
| * update joda-time javadoc urlxuwei-k2017-10-304-4/+4
|/
* Add parser settings WithXyz methodsJon Skeet2017-10-281-0/+17
|
* Add JsonParser setting to ignore unknown field valuesJon Skeet2017-10-284-7/+95
| | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838.
* Merge pull request #3722 from timou/cmake-windows-cleanJisi Liu2017-10-271-1/+20
|\ | | | | Suppress VS2017 compiler/linker warnings
| * Sort MSVC warning suppressionsTim Ebringer2017-10-211-1/+17
| | | | | | | | Add brief documentation describing each warning suppression.
| * Suppress VS2017 compiler/linker warningsTim Ebringer2017-10-061-1/+4
| | | | | | | | | | | | | | | | 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.
* | Reserve unknown in Ruby (#3763)Paul Yang2017-10-2612-832/+2034
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 filesJisi Liu2017-10-261-0/+38
| |
* | Merge pull request #3804 from pherl/mergeJisi Liu2017-10-263-2/+7
|\ \ | | | | | | Merge 3.4.x into master before cutting 3.5.x
| * \ Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-253-2/+7
| |\ \
| | * \ Merge pull request #3758 from spinorx/3.4.xJisi Liu2017-10-201-43/+2
| | |\ \ | | | | | | | | | | [v3.4.x branch] Fix iOS cc_library build for protobuf.
| | | * | Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-184-2/+45
| | |\ \ \ | | | | | | | | | | | | Add @Deprecated annotation support for proto file.
| | | * | | Add TODOJisi Liu2017-08-311-0/+3
| | | | | |
| | | * | | Fix dist checkJisi Liu2017-08-311-0/+1
| | | | | |
| | | * | | Add @Deprecated annotation support for proto file.Jisi Liu2017-08-313-2/+41
| | | | | |
| | * | | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | | Clang warning cleanup for unused parameter.
| | | * | | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
| | | | | |
* | | | | | Merge pull request #3791 from signalwerk/patch-1Adam Cozzette2017-10-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | To be clear that we set a new variable
| * | | | | To be clear that we set a new variableStefan Huber2017-10-241-1/+1
| | | | | |
* | | | | | Merge pull request #3787 from sergiocampama/coverageThomas Van Lenten2017-10-245-85/+182
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improves coverage of GPBCodedInputStream
| * | | | | Improves coverage of GPBCodedInputStreamSergio Campama2017-10-245-85/+182
|/ / / / /
* | | | | Merge pull request #3757 from spinorx/masterJisi Liu2017-10-201-43/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix iOS cc_library build for protobuf.
| * | | | | Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #3743 from Schtolc/masterJisi Liu2017-10-191-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | CodedInputStream::SetTotalBytesLimit description fix
| * | | | | | CodedInputStream::SetTotalBytesLimit description fixPavel2017-10-121-3/+3
| | | | | | |
* | | | | | | Merge pull request #3754 from toanju/gcc-fallthroughJisi Liu2017-10-191-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix implicit fallthrough in gcc 7
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 15:44:54 +0000