aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use the first enum value instead of 0 in ↵stone47742018-03-211-1/+1
| | | | DefaultValueObjectWriter::FindEnumDefault
* Fix bug: whether always_print_enums_as_ints is true or false, it always ↵stone47742018-03-195-17/+66
| | | | print the default value of enums as strings
* Convert descriptortype to type for upb_msgval_sizeof (#4357)Paul Yang2018-03-061-1/+1
|
* For encoding upb needs descriptor type instead of type. (#4354)Paul Yang2018-03-062-13/+13
|
* Merge pull request #4355 from acozzette/typoAdam Cozzette2018-03-051-1/+1
|\ | | | | PHP: fixed typo in message.c
| * PHP: fixed typo in message.cAdam Cozzette2018-03-051-1/+1
|/
* Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-262-2/+3
|\ | | | | Add support for libc++ on Windows.
| * Add support for libc++ on Windows.Peter Collingbourne2018-01-172-2/+3
| | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
* | Merge pull request #4333 from jmillikin/update-file-lists-needs-bashFeng Xiao2018-02-261-1/+1
|\ \ | | | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.
| * | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.John Millikin2018-02-241-1/+1
| | | | | | | | | | | | | | | | | | I noticed that running this script as `./update_file_lists.sh` on MacOS was corrupting `cmake/extract_includes.bat.in`. Forcing the shell to Bash fixes the generated file output.
* | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsFeng Xiao2018-02-264-3/+4
|\ \ \ | | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
| * | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.John Millikin2018-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the Bazel `CcProtoAspect` from generating and linking C++ object code for these files. Without this blacklist, symbols for protobuf types depended on by `libprotobuf` may be defined multiple times and violate the ODR rule. Fixes https://github.com/google/protobuf/issues/4311
| * | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-244-3/+3
| |/ / | | | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
* | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
|\ \ \ | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values
| * | | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
| | |/ | |/| | | | | | | unrecognized string values in enum fields as default ones.
* | | Merge pull request #4291 from google/3.5.xJisi Liu2018-02-2612-61/+189
|\ \ \ | |_|/ |/| | Merge 3.5.x to master
| * | Merge pull request #4236 from pherl/3.5.xJisi Liu2018-01-261-1/+1
| |\ \ | | | | | | | | Bumping number to fix ruby 2.1 on mac
| | * | Bumping number to fix ruby 2.1 on macJisi Liu2018-01-261-1/+1
| | | |
| * | | Fix more memory leak for php c extension (#4211)Paul Yang2018-01-257-27/+117
| |/ / | | | | | | | | | | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5
| * | Merge pull request #4185 from pherl/ruby2.5Jisi Liu2018-01-171-2/+2
| |\ \ | | | | | | | | Update rake file to build of 2.1.6.
| | * | Update rake file to build of 2.1.6.Jisi Liu2018-01-171-2/+2
| | | |
| * | | Merge pull request #4182 from pherl/ruby2.5Jisi Liu2018-01-172-3/+3
| |\| | | | | | | | | | Support ruby2.5
| | * | Support ruby2.5Jisi Liu2018-01-172-3/+3
| | | |
| * | | Well known types are not initialized properly. (#4139)Paul Yang2018-01-053-30/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, within the same load period of protobuf module, well known types are not initialized correctly for the second request. The reason is that well known type are only initialized if a method local static variable is not set. However, that variable is not reset after request ends. Therefore, when the second request comes, the method local static variable is still set (by previous request) and well types are not initialized in this case.
| * | | Merge pull request #4146 from pherl/fix_protocJisi Liu2018-01-051-1/+1
| |\ \ \ | | | | | | | | | | Bump protoc-artifact version for a patch rebuild
| | * | | Bump protoc-artifact version for a patch rebuildJisi Liu2018-01-051-1/+1
| | |/ /
* | | | Merge pull request #4324 from abdul-sami/masterFeng Xiao2018-02-221-0/+5
|\ \ \ \ | | | | | | | | | | Added instruction for existing ZLIB configuration
| * | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1Abdul Sami2018-02-211-0/+5
|/| | | | | | | | | | | | | | Added instruction for existing ZLIB configuration
| * | | | Added instruction for existing ZLIB configurationAbdul Sami2018-02-211-0/+5
|/ / / / | | | | | | | | Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
* | | | Merge pull request #4323 from dtapuska/masterFeng Xiao2018-02-201-2/+2
|\ \ \ \ | | | | | | | | | | Rename a shadowed variable.
| * | | | Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shadowed variables can cause readability issues. Ensure a shadowed variable isn't used in header files which may be used in a dependent project that explicitly disables them.
* | | | | Merge pull request #3186 from gkelly/remove-unused-variableFeng Xiao2018-02-201-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused output_file variable from js_embed
| * | | | Remove unused output_file variable from js_embedGarret Kelly2017-06-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The js_embed tool outputs to stdout, so the output_file variable is unnecessary and unused.
* | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
| | | | | | | | | | | | | | | | | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile()
* | | | | Merge pull request #4302 from BSBandme/down_integ_benchmarkYilun Chong2018-02-0917-30/+89
|\ \ \ \ \ | | | | | | | | | | | | Sync internal benchmark changes
| * | | | | Sync internal benchmark changesYilun Chong2018-02-0917-30/+89
| | | | | |
* | | | | | Remove stray indent on normal imports.Thomas Van Lenten2018-02-081-2/+2
| | | | | |
* | | | | | Merge pull request #4288 from nico/nofallFeng Xiao2018-02-082-16/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
| * | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-072-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome is running into two issues with the use of this macro in open-source protobuf (https://crbug.com/809157): 1. GOOGLE_FALLTHROUGH_INTENDED is defined to nothing on __APPLE__ platforms, which blocks us from enabling -Wimplicit-fallthrough on Mac and iOS. (We use a hermetic self-built modern clang, so whatever Xcode bug that exclusion might be for doesn't apply to us.) 2. It's in a public header file, and it's included in a public header file. When clang suggests adding [[clang::fallthrough]], it checks if it knows of a macro expanding to that and if so, suggests inserting that. Since lots of chrome code includes protobuf headers, it often suggests inserting GOOGLE_FALLTHROUGH_INTENDED (from protobuf) instead of the correct FALLTHROUGH (from chrome's base). Since the fallthrough doens't do anyting useful, just remove it. Long ago, this might have had perf impact, but d64a2d9941c36a7bc added a parsing fast path that calls this switch as slow fallback, so it should be off the hot path nowadays. No intended behavior change. This is the public version of internal change 184824132.
* | | | | | Fix up the docs to mention the WKTs generated files also.Thomas Van Lenten2018-02-071-4/+6
|/ / / / / | | | | | | | | | | | | | | | Fixes #4277
* | | | | Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\ \ \ \ \ | | | | | | | | | | | | Various CMake Update
| * | | | | Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
| * | | | | Even with MSVC enable zlib support as default behaviour.Corentin Le Molgat2018-02-011-5/+1
| | | | | |
| * | | | | Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject
| * | | | | Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
| | | | | |
* | | | | | Merge pull request #4257 from davido/support_java9Feng Xiao2018-02-011-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bazel: Support building with Java 9
| * | | | | | Bazel: Support building with Java 9David Ostrovsky2018-01-311-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #4256. Bazel@HEAD supports Java 9. The current code has one single issue with Java 9 compliance: the usage of sun.misc package. We add jdk.unsupported module with --add-modules compiler option for now. Long term, the usage of non public API should be avoided. To build with Java 9, build custom bazel version and issue: $ bazel --host_javabase=/usr/lib64/jvm/java-9-openjdk build \ --javacopt='--release 9' \ --java_toolchain=@bazel_tools//tools/jdk:toolchain_jdk9 \ :protobuf_java
* | | | | | | Merge pull request #4265 from BSBandme/upgrade_benchmark_submoduleYilun Chong2018-02-012-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Upgrade benchmark submodule
| * | | | | | | upgrade submoduleYilun Chong2018-02-012-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #4266 from brunokim/patch-1Jisi Liu2018-02-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix link markup in third party list.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 01:41:14 +0000