| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | line breaks adjsted | Ubuntu | 2017-12-20 | 1 | -5/+12 | |
| | | | | | ||||||
| * | | | | formatting issues | Ubuntu | 2017-12-20 | 2 | -8/+11 | |
| | | | | | ||||||
| * | | | | resolve issue 4032 and added a unit test | Ubuntu | 2017-12-19 | 2 | -1/+17 | |
| |/ / / | ||||||
| * | | | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054 | Adam Cozzette | 2017-12-14 | 1 | -1/+9 | |
| |\ \ \ | | | | | | | | | Java: generate an annotation to suppress deprecation warnings | |||||
| | * | | | Generate an annotation to suppress deprecation warnings | Adam Cozzette | 2017-12-13 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | The valueOf method on enums is deprecated, but for compatibility reasons the generated code has to keep using it. We can use an annotation to suppress the deprecation warnings. | |||||
| * | | | | Merge pull request #4045 from pherl/deprecate | Jisi Liu | 2017-12-14 | 2 | -5/+7 | |
| |\ \ \ \ | |/ / / |/| | | | Add deprecation annotation for oneof case. | |||||
| | * | | | Add deprecation annotation for oneof case. | Jisi Liu | 2017-12-13 | 2 | -5/+7 | |
| | | | | | ||||||
| * | | | | Add auto-generated header to C# generated files (#4038) | Jan Tattermusch | 2017-12-13 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos | |||||
| * | | | | Merge pull request #4044 from xfxyjwf/issue3268 | Feng Xiao | 2017-12-13 | 13 | -39/+39 | |
| |\ \ \ \ | | | | | | | | | | | Avoid double underscores in macro name | |||||
| | * | | | | Update generated code. | Feng Xiao | 2017-12-13 | 12 | -36/+36 | |
| | | | | | | ||||||
| | * | | | | Avoid two consecutive underscores in macro name. | Feng Xiao | 2017-12-13 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3268 | |||||
| * | | | | | Merge pull request #4041 from acozzette/fix-license-issue-1775 | Adam Cozzette | 2017-12-13 | 2 | -1/+60 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Added our standard license header to structurally_valid.cc and its test | |||||
| | * | | | | | Added our standard license header to structurally_valid.cc and its test | Adam Cozzette | 2017-12-13 | 2 | -1/+60 | |
| | | |/ / / | |/| | | | | | | | | | | | | | This fixes issue #1775. | |||||
| * | | | | | Add unknown field support for csharp (#3936) | Jie Luo | 2017-12-13 | 1 | -37/+65 | |
| | |/ / / |/| | | | | | | | Add unknown field support for csharp | |||||
| * | | | | Merge pull request #4037 from xfxyjwf/issue2880 | Feng Xiao | 2017-12-13 | 1 | -4/+4 | |
| |\ \ \ \ | |/ / / |/| | | | Clarify default value behavior in JSON conversion. | |||||
| | * | | | Clarify default value behavior in JSON conversion. | Feng Xiao | 2017-12-12 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | Make it clear default value is only omitted for proto3. | |||||
| * | | | | Merge pull request #4036 from xfxyjwf/issue3093 | Feng Xiao | 2017-12-12 | 1 | -1/+3 | |
| |\ \ \ \ | | | | | | | | | | | Update comments for Timestamp JSON format. | |||||
| | * | | | | Update comments for Timestamp JSON format. | Feng Xiao | 2017-12-12 | 1 | -1/+3 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093 | |||||
| * | | | | Merge pull request #4016 from jquesnelle/string-access-ub | Jisi Liu | 2017-12-12 | 1 | -4/+5 | |
| |\ \ \ \ | |/ / / |/| | | | fix undefined behavior in C++03 | |||||
| | * | | | use const char* instead of const std::string& in normalize() | Jeffrey Quesnelle | 2017-12-07 | 1 | -5/+5 | |
| | | | | | ||||||
| | * | | | fix undefined behavior in C++03 | Jeffrey Quesnelle | 2017-12-07 | 1 | -4/+5 | |
| | | | | | ||||||
| * | | | | C# code generation changes to use bitwise comparisons for doubles | Jon Skeet | 2017-12-09 | 2 | -12/+30 | |
| | | | | | ||||||
| * | | | | Merge pull request #4000 from Kwizatz/master | Adam Cozzette | 2017-12-08 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Using binary one's complement to negate an unsigned int | |||||
| | * | | | | Using binary one's complement to negate an unsigned int | Rodrigo Hernandez | 2017-12-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned. | |||||
| * | | | | | Use the portable version of Log2Floor for Clang with older Android NDK versions | Adam Cozzette | 2017-12-07 | 1 | -4/+12 | |
| | |/ / / |/| | | | | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl. | |||||
| * | | | | 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 | |
| | | | | | | | ||||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |