aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* objectivec: Set -Wno-vla when buildingHEADmasterGravatar Benjamin Barenblat2018-07-11
| | | | | Objective-C protobuf uses VLAs for performance reasons. Ensure Clang doesn’t complain about them.
* objectivec: Quash -Wself-assignGravatar Benjamin Barenblat2018-07-11
|
* Merge pull request #4888 from chronoxor/masterGravatar Feng Xiao2018-07-10
|\ | | | | OnShutdownDelete shadowing issue
* \ Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfigGravatar Feng Xiao2018-07-10
|\ \ | | | | | | protobuf_generate(): add relative path to output dir
| * | protobuf_generate(): add relative path to output dirGravatar Markus Heß2018-07-10
|/ / | | | | | | | | | | | | Without this fix, protobuf_generate() sets the variable _generated_srcs to ${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext} but generates the files in ${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}
| * OnShutdownDelete shadowing issueGravatar Ivan Shynkarenka2018-07-10
|/ | | | https://github.com/google/protobuf/issues/4887
* add JSON_UNESCAPED_UNICODE option (#4191)Gravatar 吕海涛2018-07-09
|
* Enable ignoring unknown in json parsing in php (#4839)Gravatar Paul Yang2018-07-09
| | | | | | | | | | * Enable ignoring unknown in json parsing in php * Update generated descriptor files * Update failure list for other languages. * Remove unnecessary php files
* implement IComparable and comparison operators on Timestamp (#4318)Gravatar Warren Falk2018-07-09
|
* Merge pull request #4876 from BSBandme/fix_cpp_benchmarkGravatar Yilun Chong2018-07-09
|\ | | | | Fix cpp benchmark dependency on mac
* \ Merge pull request #4882 from google/3.6.xGravatar Adam Cozzette2018-07-09
|\ \ | | | | | | Merge 3.6.x into master
| | * Fix cpp_distcheckGravatar BSBandme2018-07-09
| | |
| * | Merge pull request #4878 from acozzette/fix-msvc-initializationGravatar Adam Cozzette2018-07-09
| |\ \ | | | | | | | | Fix initialization with Visual Studio
* | \ \ Merge pull request #4879 from ejona86/protoc-artifacts-tls12Gravatar Adam Cozzette2018-07-09
|\ \ \ \ | | | | | | | | | | protoc-artifacts: Update centos base from 6.6 to 6.9
| * | | | protoc-artifacts: Update centos base from 6.6 to 6.9Gravatar Eric Anderson2018-07-06
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the need to use "yum update && yum upgrade" in the container to be able to contact GitHub, which requires TLS 1.2[1]. I have verified that binaries built with this container still run in the previous container; no errors like "/lib64/libc.so.6: version `GLIBC_2.14' not found", which occur if using too new of a glibc when compiling. CentOS 6.6 has glibc version 2.12 release 1.209.el6. CentOS 6.9 has glibc version 2.12 release 1.149.el6. Both would upgrade to release 1.212.el6 via "yum update && yum upgrade". 1. https://githubengineering.com/crypto-deprecation-notice/
* | | | Merge pull request #4877 from acozzette/update-docker-setupGravatar Adam Cozzette2018-07-06
|\ \ \ \ | | | | | | | | | | Updated Docker setup to use GCC 4.8
| | | * | Fix initialization with Visual StudioGravatar Adam Cozzette2018-07-06
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* | | | Merge pull request #4872 from demon386/masterGravatar Adam Cozzette2018-07-06
|\ \ \ \ | | | | | | | | | | Fix SFINAE in 'RepeatedPtrFieldBase::Add'
| | * | | Updated Docker setup to use GCC 4.8Gravatar Adam Cozzette2018-07-06
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7. This change updates the Docker setup to continue using CentOS 6.6 but with GCC 4.8. I also added libm to the whitelist for dynamically linked libraries for the ARM64 protoc binary.
| | | * Fix cpp benchmark dependency on macGravatar BSBandme2018-07-06
| |_|/ |/| |
| * | Fix SFINAE in 'RepeatedPtrFieldBase::Add'Gravatar M. Tong2018-07-06
|/ / | | | | | | | | Without this the error of un-moveable GenericTypeHandler will pop until 'TypeHandler::New(arena_, std::move(value))' is called.
* | Update message_module.cc (#4835)Gravatar Thomas Colthurst2018-07-03
| | | | | | | | | | | | | | | | * Update message_module.cc Add missing piece from pull request #4698: actually initialize the new API object. * Update message_module.cc
* | Merge pull request #4863 from xfxyjwf/examplesGravatar Feng Xiao2018-07-03
|\ \ | | | | | | Fix bazel build of examples.
| * | Fix bazel build of examples.Gravatar Feng Xiao2018-07-03
| | |
* | | Merge pull request #4856 from xfxyjwf/optionsGravatar Feng Xiao2018-07-03
|\| | | | | | | | Add global extension registry to the repo.
| * | Add global extension registry to the repo.Gravatar Feng Xiao2018-07-02
|/ /
* | Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Gravatar Paul Yang2018-07-02
| | | | | | | | | | | | | | | | | | | | | | | | * Add continuous test for ruby 2.3, 2.4 and 2.5 * Change ruby 2.5 to 2.5.0 * No need to provide argument to rb_funcall when argc is 0 * Fix tests for ruby 2.5 * Use rescue instead of assert_raise to accept subclass of error
* | Merge pull request #3981 from fahhem/patch-3Gravatar Adam Cozzette2018-07-02
|\ \ | | | | | | Handle srcs in generated files by cd'ing in and out
* \ \ Merge pull request #4321 from devwout/ruby_json_omit_repeatedGravatar Joshua Haberman2018-07-02
|\ \ \ | | | | | | | | Ruby JSON encoding omits zero-length repeated fields by default.
* \ \ \ Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleGravatar Joshua Haberman2018-07-02
|\ \ \ \ | | | | | | | | | | Feat: add import-style=commonjs_strict option to the compiler
* \ \ \ \ Merge pull request #3847 from FX-HAO/masterGravatar Joshua Haberman2018-07-02
|\ \ \ \ \ | | | | | | | | | | | | Google::Protobuf::Struct can access a missing key (#3846)
* \ \ \ \ \ Merge pull request #4854 from nehaljwani/win-exportsGravatar Adam Cozzette2018-07-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Missing symbol exports for Windows DLL
* \ \ \ \ \ \ Merge pull request #4847 from depristo/masterGravatar Feng Xiao2018-07-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove write-strings warning from COPTs
* \ \ \ \ \ \ \ Merge pull request #4853 from jnordberg/patch-1Gravatar Adam Cozzette2018-07-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add wsrpc
| | | * | | | | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Gravatar Nehal J Wani2018-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| | | * | | | | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsGravatar Adam Cozzette2018-07-01
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
| | * | | | | | Remove unclear comment.Gravatar mdepristo2018-06-30
| | | | | | | |
| * | | | | | | Add wsrpcGravatar Johan Nordberg2018-06-30
|/ / / / / / /
* | | | | | | Merge pull request #4846 from ckhardin/mips-big-endianGravatar Feng Xiao2018-06-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix to allow a compilation under mips big endian with gcc
* | | | | | | | Fix capsule name. (#4836)Gravatar Thomas Colthurst2018-06-29
| | | | | | | | | | | | | | | | | | | | | | | | Internal convert file was broken. Change the capsule to the correct name
| | * | | | | | Remove write-strings warning from COPTs.Gravatar depristo2018-06-28
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | This change reduces the excessive warnings when compiling C++ protobufs like "external/protobuf_archive/python/google/protobuf/pyext/message.cc:2629:1: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]"
| * | | | | | Fix to allow a compilation under mips big endian with gccGravatar Charles Hardin2018-06-28
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __MIPSEL__ is mips little endian, specific and we needed to compile for a big endian mips target that also happened to be a mips64, so replaced the __MIPSEL__ with a __mip__ which should preserve the build on little endian and allow a build for a big endian setup. $ echo | mips64-linux-gcc -E -dM - ... snip snip ... #define __mips__ 1 #define __MIPSEB__ 1 Signed-off-by: Charles Hardin <ckhardin@gmail.com>
* | | | | | Add -Og to no-warning-test (#4830)Gravatar Paul Yang2018-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add -Og to no-warning-test * Initialize value * Implement PrintFieldName in CompactRepeatedFieldPrinter to prevent Woverloaded-virtual * Update generated code
* | | | | | When initializing a message, skip a field if value is nil (#3693)Gravatar Zachary Anker2018-06-26
| | | | | |
* | | | | | Adds a base class for all explicitly raised TypeErrors (#4255)Gravatar Erik Benoist2018-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This allows for ruby code to catch and handle Protobuf TypeErrors separately from the standard Ruby TypeError * Maintains backwards compatibility by having the new Google::Protobuf::TypeError inherit from the base TypeError. Any code that was catching TypeError should continue to work.
* | | | | | Merge pull request #4828 from mmatuszak-google/patch-1Gravatar Adam Cozzette2018-06-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed forward declaration of MemBlock class
| * | | | | | Removed forward declaration of MemBlock classGravatar Michal Matuszak2018-06-25
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Removed forward declaration of MemBlock class. Declaration is in conflict with declaration `::strings::MemBlock`
* | | | | | Merge pull request #4827 from acozzette/merge-3-6-xGravatar Adam Cozzette2018-06-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 3.6.x branch into master
* | | | | | | Remove protoc conditional properties (#4817)Gravatar Sydney Acksman2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove protoc conditional properties * Fix duplicate brace
* | | | | | | Update minimal Python version to 2.7 (#4207)Gravatar Yuchen Xie2018-06-25
| | | | | | |