aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | objectivec: Quash -Wself-assign and -Wvla (#4897)Benjamin Barenblat2018-07-112-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * objectivec: Quash -Wself-assign * objectivec: Set -Wno-vla when building Objective-C protobuf uses VLAs for performance reasons. Ensure Clang doesn’t complain about them.
* | | | Merge pull request #4888 from chronoxor/masterFeng Xiao2018-07-101-1/+1
|\ \ \ \ | | | | | | | | | | OnShutdownDelete shadowing issue
| * | | | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | https://github.com/google/protobuf/issues/4887
* | | | | Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfigFeng Xiao2018-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | protobuf_generate(): add relative path to output dir
| * | | | protobuf_generate(): add relative path to output dirMarkus Heß2018-07-101-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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}
* | | | add JSON_UNESCAPED_UNICODE option (#4191)吕海涛2018-07-092-2/+2
| | | |
* | | | Enable ignoring unknown in json parsing in php (#4839)Paul Yang2018-07-0916-218/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)Warren Falk2018-07-092-1/+205
| | | |
* | | | Merge pull request #4876 from BSBandme/fix_cpp_benchmarkYilun Chong2018-07-092-2/+1
|\ \ \ \ | | | | | | | | | | Fix cpp benchmark dependency on mac
| * | | | Fix cpp_distcheckBSBandme2018-07-091-2/+0
| | | | |
| * | | | Fix cpp benchmark dependency on macBSBandme2018-07-061-0/+1
| | | | |
* | | | | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\ \ \ \ \ | | |_|/ / | |/| | | Merge 3.6.x into master
| * | | | Merge pull request #4878 from acozzette/fix-msvc-initializationAdam Cozzette2018-07-0911-319/+132
| |\ \ \ \ | | |_|_|/ | |/| | | Fix initialization with Visual Studio
| | * | | Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #4879 from ejona86/protoc-artifacts-tls12Adam Cozzette2018-07-091-1/+1
|\ \ \ \ | | | | | | | | | | protoc-artifacts: Update centos base from 6.6 to 6.9
| * | | | protoc-artifacts: Update centos base from 6.6 to 6.9Eric Anderson2018-07-061-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-setupAdam Cozzette2018-07-063-10/+9
|\ \ \ \ | | | | | | | | | | Updated Docker setup to use GCC 4.8
| * | | | Updated Docker setup to use GCC 4.8Adam Cozzette2018-07-063-10/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #4872 from demon386/masterAdam Cozzette2018-07-061-2/+2
|\ \ \ \ | |/ / / |/| | | Fix SFINAE in 'RepeatedPtrFieldBase::Add'
| * | | Fix SFINAE in 'RepeatedPtrFieldBase::Add'M. Tong2018-07-061-2/+2
|/ / / | | | | | | | | | | | | Without this the error of un-moveable GenericTypeHandler will pop until 'TypeHandler::New(arena_, std::move(value))' is called.
* | | Update message_module.cc (#4835)Thomas Colthurst2018-07-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | * 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/examplesFeng Xiao2018-07-032-2/+13
|\ \ \ | | | | | | | | Fix bazel build of examples.
| * | | Fix bazel build of examples.Feng Xiao2018-07-032-2/+13
| | | |
* | | | Merge pull request #4856 from xfxyjwf/optionsFeng Xiao2018-07-031-0/+186
|\| | | | | | | | | | | Add global extension registry to the repo.
| * | | Add global extension registry to the repo.Feng Xiao2018-07-021-0/+186
|/ / /
* | | Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)Paul Yang2018-07-026-36/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-3Adam Cozzette2018-07-022-32/+107
|\ \ \ | | | | | | | | Handle srcs in generated files by cd'ing in and out
| * | | Fix generated_protos_proto depsFahrzin Hemmati2018-05-071-2/+4
| | | |
| * | | Fix moving generated files onto themselvesFahrzin Hemmati2018-05-071-3/+5
| | | |
| * | | Add unittest build rulesFahrzin Hemmati2018-05-071-0/+27
| | | |
| * | | Only use realpath when in gendir, and use the original ctx.action if not in ↵Fahrzin Hemmati2018-05-071-20/+24
| | | | | | | | | | | | | | | | gendir
| * | | Track outputs correctlyFahrzin Hemmati2018-05-071-2/+5
| | | |
| * | | Handle multiple outs per input (for plugins)Fahrzin Hemmati2018-05-071-22/+25
| | | |
| * | | Strip trailing / from pathFahrzin Hemmati2018-05-071-1/+1
| | | |
| * | | Handle srcs in generated files by cd'ing in and outFahrzin Hemmati2018-05-071-28/+62
| | | |
* | | | Merge pull request #4321 from devwout/ruby_json_omit_repeatedJoshua Haberman2018-07-022-1/+7
|\ \ \ \ | | | | | | | | | | Ruby JSON encoding omits zero-length repeated fields by default.
| * | | | Ruby JSON encoding omits zero-length repeated fields by default.Ewout2018-02-202-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | This makes it behave the same way as the other implementations. It is also nice to always encode an empty message as {}.
* | | | | Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-028-11/+202
|\ \ \ \ \ | | | | | | | | | | | | Feat: add import-style=commonjs_strict option to the compiler
| * | | | | fix(js_generator): check for protoPeter Marton2018-05-211-0/+1
| | | | | |
| * | | | | Fix strict JS generator with import in a protofilePeter Marton2018-05-086-9/+65
| | | | | |
| * | | | | Test: cover import_style=commonjs_strictPeter Marton2018-05-084-1/+112
| | | | | |
| * | | | | Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-083-10/+33
| | |/ / / | |/| | |
* | | | | Merge pull request #3847 from FX-HAO/masterJoshua Haberman2018-07-022-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Google::Protobuf::Struct can access a missing key (#3846)
| * | | | | Google::Protobuf::Struct can access a missing key (#3846)parker2017-11-172-0/+12
| | | | | |
* | | | | | Merge pull request #4854 from nehaljwani/win-exportsAdam Cozzette2018-07-022-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Missing symbol exports for Windows DLL
| * | | | | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
| * | | | | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
* | | | | | | Merge pull request #4847 from depristo/masterFeng Xiao2018-07-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove write-strings warning from COPTs
| * | | | | | | Remove unclear comment.mdepristo2018-06-301-1/+0
| | | | | | | |
| * | | | | | | Remove write-strings warning from COPTs.depristo2018-06-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 02:23:34 +0000