aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
...
| | * | io_win32: add more encoding-related testsGravatar Laszlo Csomor2017-12-07
| | | |
| | * | io_win32: support non-ASCII pathsGravatar Laszlo Csomor2017-12-07
| | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951
| | * | io_win32_unittest: make //:win32_test run againGravatar Laszlo Csomor2017-12-07
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Do not use "googletest.h", apprently that leads to linking errors on Windows which I couldn't figure out how to solve, and decided to just go with plain gTest instead. See https://github.com/google/protobuf/issues/3951
* | | 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
| | | |
| | * | Clang warning cleanup for unused parameter.Gravatar drivehappy2017-09-14
| | | |
* | | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
| | | |
* | | | Clang warning cleanup for unused parameter.Gravatar drivehappy2017-09-13
| | | |
| | * | Revert "Fix js conformance tests. (#3604)" (#3633)Gravatar Paul Yang2017-09-13
| | | | | | | | | | | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b.
| * | | Rename ClassNamePrefix to ConstantNamePrefixGravatar Bo Yang2017-09-13
| | | |
| | * | Fix js conformance tests. (#3604)Gravatar Paul Yang2017-09-12
| | | | | | | | | | | | | | | | | | | | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests
| * | | Exclude valid constant name from reserved name.Gravatar Bo Yang2017-09-12
| | | |
* | | | Exclude addressbook.proto from C# boostrap test.Gravatar Feng Xiao2017-09-11
| | | | | | | | | | | | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target.
| * | | Add prefix to php reserved keywords.Gravatar Bo Yang2017-09-08
| |/ /