aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-132-9/+3
| | | | | | | This #ifdef in hash.h causes us to give up on finding a hash function on Android, when there do seem to be hash functions available in practice. I also had to tweak a macro in map.h that was disabling on Android an allocator construct() method that we need.
* Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-1319-1059/+1059
|\ | | | | remove leading whitespace in C# xml comments
| * remove leading whitespace in C# xml commentsJan Tattermusch2016-12-1219-1059/+1059
| |
* | Merge pull request #2471 from jbrianceau/fix-include-styleFeng Xiao2016-12-123-3/+3
|\ \ | | | | | | Fix #include in cc files
| * | Fix #include in cc filesJulien Brianceau2016-12-093-3/+3
| | |
* | | Merge pull request #2490 from xfxyjwf/icon2Jisi Liu2016-12-121-1/+1
|\ \ \ | | | | | | | | Add a badge for bazel build status.
| * | | Add a badge for bazel build status.Feng Xiao2016-12-121-1/+1
|/ / /
* | | Merge pull request #2454 from pongad/go_packageFeng Xiao2016-12-123-8/+10
|\ \ \ | |_|/ |/| | update descriptor.proto's go_package
| * | update descriptor.proto's go_packageMichael Darakananda2016-12-073-8/+10
| | | | | | | | | | | | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* | | generate_changelog.py: flush output so piping works correctly.Josh Haberman2016-12-091-0/+1
| | |
* | | Merge pull request #2476 from acozzette/generated-message-reflection-fixAdam Cozzette2016-12-091-4/+4
|\ \ \ | | | | | | | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro
| * | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macroAdam Cozzette2016-12-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been some reports that this necessary to prevent build failures in some environments. It makes sense to do this anyway since the result of this macro is ultimately assigned to uint32 in the generated code.
* | | | Merge pull request #2475 from sergiocampama/rvm2Thomas Van Lenten2016-12-092-13/+0
|\ \ \ \ | |/ / / |/| | | Reenable cocoapods objc test and remove unnecessary workaround for rvm
| * | | Reenable cocoapods objc test and remove unnecessary workaround for rvmSergio Campama2016-12-092-13/+0
|/ / /
* | | Merge pull request #2473 from thomasvl/update_xcodesThomas Van Lenten2016-12-093-10/+43
|\ \ \ | |_|/ |/| | Update xcode version support and travis usage
| * | Mark objectivec_cocoapods_integration as failingThomas Van Lenten2016-12-091-0/+4
| | |
| * | Skip benchmark test if cmake isn't installed.Thomas Van Lenten2016-12-091-5/+15
| | |
| * | Xcode 8.1 supportThomas Van Lenten2016-12-093-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | - Add entries to objectivec/DevTools/full_mac_build.sh - Support `-quiet` via an option on full_mac_build.sh. NOTE: we don't use this on travis because the lack of output for a long time could cause travis to kill the build (when we get a slow VM). - Update travis config to use newer images.
* | | Merge pull request #2468 from sergei-ivanov/patch-1Feng Xiao2016-12-081-2/+2
|\ \ \ | | | | | | | | Update third_party.md
| * | | Update third_party.mdSergei Ivanov2016-12-091-2/+2
| | | | | | | | | | | | Updated the location for `protobuf-maven-plugin`
* | | | Disable jruby test. (#2469)Paul Yang2016-12-081-1/+1
|/ / / | | | | | | Missed in #2467.
* | | Update commit id in Dockerfile to trigger update. (#2467)Paul Yang2016-12-084-9/+16
| | |
* | | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2Feng Xiao2016-12-0813-91/+94
|\ \ \ | | | | | | | | C++: export _xxx_default_instance_ symbols
| * | | Regenerate descriptor protoJulien Brianceau2016-12-0812-88/+88
| | | |
| * | | C++: export _xxx_default_instance_ symbolsJulien Brianceau2016-12-081-3/+6
| | | | | | | | | | | | | | | | | | | | _xxx_default_instance_ symbols are used in inline functions. We have to export them to avoid undefined reference link errors.
* | | | Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-ccFeng Xiao2016-12-081-0/+1
|\ \ \ \ | | | | | | | | | | Add missing include in embed.cc
| * | | | Add missing include in embed.ccJulien Brianceau2016-12-081-0/+1
| |/ / / | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'assert'" compilation error.
* | | | Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\ \ \ \ | | | | | | | | | | oneOf fix for JsonFormat includingDefaultValueFields
| * | | | oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
| | | | |
* | | | | Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-0863-5231/+6509
| |_|/ / |/| | | | | | | | | | | 1. Generate single file for each message. 2. Lazily initiate metadata.
* | | | Merge pull request #2466 from thomasvl/deprecation_followupThomas Van Lenten2016-12-0811-6/+216
|\ \ \ \ | | | | | | | | | | Improve ObjC deprecated annotation support.
| * | | | Improve ObjC deprecated annotation support.Thomas Van Lenten2016-12-0811-6/+216
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check the parent file options for deprecation when deciding to tag Messages and Enums as deprecated. - Within the generated source push/pop the warning for implementing deprecated things around a deprecated class implementation. - Annotate the methods generated for extension fields as deprecated. - Add a testing .proto file that covers deprecated fields, messages, enums, enum values and compile it into the unittests to confirm things compile cleanly. - Add a testing .proto file that uses the file level option to make everything deprecated and compile it into the unittests to confirm things compile cleanly.
* | | | Merge pull request #2460 from sergiocampama/c11Feng Xiao2016-12-082-0/+984
|\ \ \ \ | |/ / / |/| | | Include -std=c++11 when compiling protobuf if available.
| * | | Include -std=c++11 when compiling protobuf if available.Sergio Campama2016-12-072-0/+984
| | |/ | |/|
* | | Merge pull request #2459 from acozzette/android-loggingAdam Cozzette2016-12-071-2/+11
|\ \ \ | | | | | | | | Send all protobuf logging to logcat by default on Android
| * | | Send all protobuf logging to logcat by default on AndroidAdam Cozzette2016-12-071-2/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the default for protobuf on Android is to silently drop all log messages. This makes debugging difficult because things like GOOGLE_LOG(FATAL) will crash the process without actually logging a useful error. This CL changes the logging so that by default we send messages for all log levels to logcat (and stderr). Users can override this by setting GOOGLE_PROTOBUF_MIN_LOG_LEVEL. Also, that option was not being respected for non-Android platforms so I went ahead and fixed that to make things consistent.
* | | Ruby: removed redundant RepeatedField#slice. (#2449)Joshua Haberman2016-12-071-1/+1
| | |
* | | Merge pull request #2407 from jbrianceau/fix-comp-buildsFeng Xiao2016-12-071-1/+1
|\ \ \ | |/ / |/| | Export symbols used in inline functions
| * | Export symbols used in inline functionsJulien Brianceau2016-12-071-1/+1
|/ / | | | | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
* | Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-0610-41/+1058
|\ \ | | | | | | Add version number to plugin protocol.
| * | Add version number to plugin protocol.Feng Xiao2016-12-0510-41/+1058
| | |
* | | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \ \ | | | | | | | | OpenBSD correct endianess handling
| * | | when on OpenBSD we include the correct headers for endianess and check the ↵ramrunner2016-12-051-1/+5
| | | | | | | | | | | | | | | | apropriate defines
* | | | Merge pull request #2442 from pherl/fix-bazelJisi Liu2016-12-052-0/+2
|\ \ \ \ | | | | | | | | | | Add missing files.
| * | | | Add missing files.Jisi Liu2016-12-052-0/+2
|/ / / /
* | / / Factored Conformance and Benchmark test messages into shared test schema. ↵Joshua Haberman2016-12-0319-3878/+4032
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#1971) * Factored Conformance test messages into shared test schema. * Updated benchmarks to use new proto3 message locations. * Fixed include path. * Conformance: fixed include of Python test messages. * Make maven in Rakefile use --batch-mode. * Revert changes to benchmarks. On second thought I think a separate schema for CPU benchmarking makes sense. * Try regenerating C# protos for new test protos. * Removed benchmark messages from test proto. * Added Jon Skeet's fixes for C#. * Removed duplicate/old test messages C# file. * C# fixes for test schema move. * Fixed C# to use the correct TestAllTypes message. * Fixes for Objective C test schema move. * Added missing EXTRA_DIST file.
* | | Merge pull request #2436 from cgrushko/patch-1Feng Xiao2016-12-021-0/+7
|\ \ \ | | | | | | | | Add a proto_lang_toolchain() for cc_proto_library
| * | | Add a proto_lang_toolchain() for cc_proto_librarycgrushko2016-12-021-0/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bazel's built-in cc_proto_library rule uses a proto_lang_toolchain to learn how to invoke proto-compiler. To use Bazel's cc_proto_library, add the following to your project's WORKSPACE file: local_repository( name = "com_google_protobuf_cc", path = "/path/to/protobuf-distribution/" )
* | | Merge pull request #2431 from saintstack/2228v2Feng Xiao2016-12-022-5/+80
|\ \ \ | | | | | | | | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB to
| * | | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integer.MAX_SIZE (0x7FFFFFF) #2228 M java/core/src/main/java/com/google/protobuf/CodedInputStream.java Set DEFAULT_SIZE_LIMIT to Integer.MAX_SIZE (Was 64MB). This is how it was in pre-2.7.0 pb. Changed size check to an overflow-conscious test (as it is later in tryRefillBuffer (making sizeLimit a long was to disruptive). M java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java Add two tests that echo tests recently added over in c++ to test parse of message sizes that are approach and are beyond the size limit.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 01:04:26 +0000