Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 9 | -3/+30 |
| | | | | | | | | | | 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. | ||||
* | update joda-time javadoc url | xuwei-k | 2017-10-30 | 1 | -1/+1 |
| | |||||
* | Reserve unknown in Ruby (#3763) | Paul Yang | 2017-10-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 | 1 | -2/+5 |
|\ | |||||
| * | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 | 1 | -2/+5 |
| |\ | | | | | | | Add @Deprecated annotation support for proto file. | ||||
| | * | Add @Deprecated annotation support for proto file. | Jisi Liu | 2017-08-31 | 1 | -2/+5 |
| | | | |||||
| * | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | Jisi Liu | 2017-10-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Clang warning cleanup for unused parameter. | ||||
| | * | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Fix js conformance tests. (#3604)" (#3633) | Paul Yang | 2017-09-13 | 1 | -29/+5 |
| | | | | | | | | | | | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b. | ||||
| | * | | Fix js conformance tests. (#3604) | Paul Yang | 2017-09-12 | 1 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests | ||||
* | | | | Merge pull request #3743 from Schtolc/master | Jisi Liu | 2017-10-19 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | CodedInputStream::SetTotalBytesLimit description fix | ||||
| * | | | | CodedInputStream::SetTotalBytesLimit description fix | Pavel | 2017-10-12 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #3754 from toanju/gcc-fallthrough | Jisi Liu | 2017-10-19 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | fix implicit fallthrough in gcc 7 | ||||
| * | | | | | fix implicit fallthrough in gcc 7 | Tobias Jungel | 2017-10-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes #3700 | ||||
* | | | | | | Fix Java 1.6 compile | Jisi Liu | 2017-10-18 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fix bazel build | Jisi Liu | 2017-10-18 | 1 | -4/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unsiged underflow | Jisi Liu | 2017-10-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove C++11 only usages in io_win32 tests. | Jisi Liu | 2017-10-18 | 1 | -13/+21 |
| | | | | | | | |||||
* | | | | | | | Merge from google internal | Jisi Liu | 2017-10-18 | 75 | -2889/+3302 |
|/ / / / / / | |||||
* / / / / / | Fix undefined memory management found by Clang's sanitizers. | John Millikin | 2017-10-16 | 4 | -10/+16 |
|/ / / / / | | | | | | | | | | | | | | | | See https://github.com/google/protobuf/issues/3752 for context. | ||||
* | | | | | Move namespace closing brace inside the header guard block | Francois Marier | 2017-10-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 3 | -9/+65 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge pull request #3690 from pherl/3.4.x | Jisi Liu | 2017-10-02 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Remove ranged based for in io_win32.cc | ||||
| | * | | | Remove ranged based for in io_win32.cc | Jisi Liu | 2017-09-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add spaces | Jisi Liu | 2017-09-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix C++11 string accessors | Jisi Liu | 2017-09-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Rename ClassNamePrefix to ConstantNamePrefix | Bo Yang | 2017-09-13 | 1 | -4/+3 |
| | | | | |||||
| * | | | Exclude valid constant name from reserved name. | Bo Yang | 2017-09-12 | 1 | -2/+35 |
| | | | | |||||
| * | | | Add prefix to php reserved keywords. | Bo Yang | 2017-09-08 | 1 | -3/+21 |
| |/ / | |||||
| * / | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 3 | -137/+137 |
| |/ | | | | | internal descriptor.proto | ||||
| * | Make distcheck aware of test proto files. | Jisi Liu | 2017-08-23 | 1 | -2/+8 |
| | | |||||
* | | Use constexpr more with VC++ 2017 (#3707) | Bruce Dawson | 2017-10-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* | | Test Shutdown can be called multiple times. | Jisi Liu | 2017-09-21 | 1 | -0/+2 |
| | | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 118 | -12977/+11217 |
| | | |||||
* | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-13 | 1 | -1/+1 |
| | | |||||
* | | Exclude addressbook.proto from C# boostrap test. | Feng Xiao | 2017-09-11 | 1 | -5/+0 |
| | | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target. | ||||
* | | Merge pull request #3503 from gburgessiv/master | Jisi Liu | 2017-08-24 | 1 | -1/+4 |
|\ \ | | | | | | | Work around a bug in clang's static analyzer | ||||
| * | | Work around a bug in clang's static analyzer | George Burgess IV | 2017-08-22 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | Due to https://bugs.llvm.org/show_bug.cgi?id=34198, clang's static analyzer emits diagnostics about leaking `container`. Doing this assignment in two steps works around this, and shouldn't cause these issues. | ||||
* | | | Merge pull request #3548 from google/3.4.x | Jisi Liu | 2017-08-22 | 3 | -54/+17 |
|\ \ \ | | |/ | |/| | Merge fixes from 3.4.x into master | ||||
| * | | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
| | | | | | | | | | | | | Also remove cord related code | ||||
| * | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 | Jisi Liu | 2017-08-22 | 2 | -29/+33 |
| |\ \ | | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | ||||
| | * | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
| | | | | | | | | | | | | Fixing unused parameter warnings under Clang. | ||||
| * | | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-21 | 1 | -2/+5 |
| |/ / | | | | | | | Fixing -Wexpansion-to-defined Clang warning | ||||
| * | | Fix compile errors | Jisi Liu | 2017-08-21 | 1 | -3/+3 |
| | | | |||||
| * | | Remove C++11 features in io_win32.cc | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back() | ||||
* | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
|\ \ \ | | | | | | | | | Fixing unused parameter warnings under Clang. | ||||
| * | | | Fixing unused parameter warnings under Clang. | drivehappy | 2017-08-21 | 2 | -29/+33 |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 179 | -7262/+12264 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix cmath/math.h include with non C++11 libstdc++ | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
| | |