Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 35 | -433/+100 |
|\ | |||||
| * | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 31 | -200/+92 |
| |\ | |||||
| | * | Support win32 long path for cross compiled build | Jisi Liu | 2017-11-10 | 13 | -29/+22 |
| | | | |||||
| | * | Merge pull request #3854 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 3 | -130/+2 |
| | |\ | | | | | | | | | Fix Atomic32/AtomicWord on some platforms. | ||||
| | | * | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 3 | -130/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms. | ||||
| | * | | Provide util funtions to figure out correct php class names. (#3850) | Paul Yang | 2017-11-08 | 2 | -9/+36 |
| | |/ | |||||
| | * | Update generated descritpors. | Jisi Liu | 2017-11-02 | 12 | -24/+24 |
| | | | |||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 2 | -8/+8 |
| | | | |||||
| * | | Merge pull request #3955 from linux-on-ibm-z/master | Feng Xiao | 2017-11-30 | 1 | -0/+8 |
| |\ \ | | | | | | | | | Adding Release_CompareAndSwap 64-bit variant | ||||
| | * | | Adding Release_CompareAndSwap 64-bit variant | Nayana-ibm | 2017-11-27 | 1 | -0/+8 |
| | | | | |||||
| * | | | Added back in LIBPROTOC_EXPORT which was removed by mistake | Adam Cozzette | 2017-11-28 | 1 | -1/+1 |
| |/ / | |||||
| * / | Move C#-only test protos to csharp/protos | Jon Skeet | 2017-11-12 | 4 | -233/+0 |
| |/ | | | | | | | | | | | | | | | | | | | 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#. | ||||
* / | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 100 | -2750/+3514 |
|/ | |||||
* | 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. |