aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
* Add unknown field support for csharp (#3936)Gravatar Jie Luo2017-12-13
| | | Add unknown field support for csharp
* Merge pull request #4037 from xfxyjwf/issue2880Gravatar Feng Xiao2017-12-13
|\ | | | | Clarify default value behavior in JSON conversion.
* \ Merge pull request #4036 from xfxyjwf/issue3093Gravatar Feng Xiao2017-12-12
|\ \ | | | | | | Update comments for Timestamp JSON format.
* \ \ Merge pull request #4016 from jquesnelle/string-access-ubGravatar Jisi Liu2017-12-12
|\ \ \ | | | | | | | | fix undefined behavior in C++03
| | | * Clarify default value behavior in JSON conversion.Gravatar Feng Xiao2017-12-12
| |_|/ |/| | | | | | | | Make it clear default value is only omitted for proto3.
| | * Update comments for Timestamp JSON format.Gravatar Feng Xiao2017-12-12
| |/ |/| | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093
* | C# code generation changes to use bitwise comparisons for doublesGravatar Jon Skeet2017-12-09
| |
* | Merge pull request #4000 from Kwizatz/masterGravatar Adam Cozzette2017-12-08
|\ \ | | | | | | Using binary one's complement to negate an unsigned int
| | * use const char* instead of const std::string& in normalize()Gravatar Jeffrey Quesnelle2017-12-07
| | |
* | | Use the portable version of Log2Floor for Clang with older Android NDK versionsGravatar Adam Cozzette2017-12-07
| | | | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl.
| | * fix undefined behavior in C++03Gravatar Jeffrey Quesnelle2017-12-07
| |/ |/|
| * Using binary one's complement to negate an unsigned intGravatar Rodrigo Hernandez2017-12-07
| | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned.
* | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
| * Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\
| * \ Merge pull request #3955 from linux-on-ibm-z/masterGravatar Feng Xiao2017-11-30
| |\ \ | | | | | | | | Adding Release_CompareAndSwap 64-bit variant
| * | | Added back in LIBPROTOC_EXPORT which was removed by mistakeGravatar Adam Cozzette2017-11-28
| | | |
| | * | Adding Release_CompareAndSwap 64-bit variantGravatar Nayana-ibm2017-11-27
| |/ /
| * / Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
|/ / | | | | | | | | | | | | | | | | | | 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#.
| * Support win32 long path for cross compiled buildGravatar Jisi Liu2017-11-10
| |
| * Merge pull request #3854 from pherl/3.5.xGravatar Jisi Liu2017-11-08
| |\ | | | | | | Fix Atomic32/AtomicWord on some platforms.
| * | Provide util funtions to figure out correct php class names. (#3850)Gravatar Paul Yang2017-11-08
| | |
| | * Fix Atomic32/AtomicWord on some platforms.Gravatar Jisi Liu2017-11-08
| |/ | | | | | | | | | | | | | | | | | | - 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.
| * Update generated descritpors.Gravatar Jisi Liu2017-11-02
| |
| * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/
* Fix merging with message-valued oneofGravatar Jon Skeet2017-10-31
| | | | | | | | | | 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 urlGravatar xuwei-k2017-10-30
|
* Reserve unknown in Ruby (#3763)Gravatar Paul Yang2017-10-26
| | | | | | | | | | | | | | | | | | | | | | | | * 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 masterGravatar Jisi Liu2017-10-25
|\
* \ Merge pull request #3743 from Schtolc/masterGravatar Jisi Liu2017-10-19
|\ \ | | | | | | CodedInputStream::SetTotalBytesLimit description fix
* \ \ Merge pull request #3754 from toanju/gcc-fallthroughGravatar Jisi Liu2017-10-19
|\ \ \ | | | | | | | | fix implicit fallthrough in gcc 7
* | | | Fix Java 1.6 compileGravatar Jisi Liu2017-10-18
| | | |
| | | * Merge pull request #3578 from pherl/filedeprecationGravatar Jisi Liu2017-10-18
| | | |\ | | | | | | | | | | Add @Deprecated annotation support for proto file.
| | | * \ Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Gravatar Jisi Liu2017-10-18
| | | |\ \ | | | | | | | | | | | | Clang warning cleanup for unused parameter.
* | | | | | Fix bazel buildGravatar Jisi Liu2017-10-18
| | | | | |
* | | | | | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \
* | | | | | | Merge from google internalGravatar Jisi Liu2017-10-18
| | | | | | |
| * | | | | | Fix unsiged underflowGravatar Jisi Liu2017-10-18
| | | | | | |
| * | | | | | Remove C++11 only usages in io_win32 tests.Gravatar Jisi Liu2017-10-18
|/ / / / / /
* | | | | | Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
| | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/google/protobuf/issues/3752 for context.
| * | | | | fix implicit fallthrough in gcc 7Gravatar Tobias Jungel2017-10-15
|/ / / / / | | | | | | | | | | | | | | | fixes #3700
* | | | | Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
| | | | |
| * | | | CodedInputStream::SetTotalBytesLimit description fixGravatar Pavel2017-10-12
| | | | |
* | | | | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Use constexpr more with VC++ 2017 (#3707)Gravatar Bruce Dawson2017-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | Merge pull request #3690 from pherl/3.4.xGravatar Jisi Liu2017-10-02
| |\ \ \ | | | | | | | | | | Remove ranged based for in io_win32.cc
| * | | | Add spacesGravatar Jisi Liu2017-09-27
| | | | |
| * | | | Fix C++11 string accessorsGravatar Jisi Liu2017-09-27
| | | | |
| | * | | Remove ranged based for in io_win32.ccGravatar Jisi Liu2017-09-27
| |/ / /
* | | | Test Shutdown can be called multiple times.Gravatar Jisi Liu2017-09-21
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 05:42:52 +0000