aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Allow list values to be null when parsingGravatar Jon Skeet2018-03-01
|
* Merge pull request #4183 from pcc/win-libcxxGravatar Feng Xiao2018-02-26
|\ | | | | Add support for libc++ on Windows.
* \ Merge pull request #4333 from jmillikin/update-file-lists-needs-bashGravatar Feng Xiao2018-02-26
|\ \ | | | | | | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.
* \ \ Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsGravatar Feng Xiao2018-02-26
|\ \ \ | | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
* \ \ \ Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonGravatar Feng Xiao2018-02-26
|\ \ \ \ | | | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values
* \ \ \ \ Merge pull request #4291 from google/3.5.xGravatar Jisi Liu2018-02-26
|\ \ \ \ \ | | | | | | | | | | | | Merge 3.5.x to master
| | | * | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.Gravatar John Millikin2018-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar John Millikin2018-02-24
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
| | | * | `update_file_lists.sh` depends on Bash features, thus needs Bash sebang.Gravatar John Millikin2018-02-24
| |_|/ / |/| | | | | | | | | | | | | | | | | | | 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 #4324 from abdul-sami/masterGravatar Feng Xiao2018-02-22
|\ \ \ \ | | | | | | | | | | Added instruction for existing ZLIB configuration
| * | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1Gravatar Abdul Sami2018-02-21
|/| | | | | | | | | | | | | | Added instruction for existing ZLIB configuration
| * | | | Added instruction for existing ZLIB configurationGravatar Abdul Sami2018-02-21
|/ / / / | | | | | | | | 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/masterGravatar Feng Xiao2018-02-20
|\ \ \ \ | | | | | | | | | | Rename a shadowed variable.
| * | | | Rename a shadowed variable.Gravatar Dave Tapuska2018-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-variableGravatar Feng Xiao2018-02-20
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused output_file variable from js_embed
| | | * | The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
| | | | | | | | | | | | | | | | | | | | unrecognized string values in enum fields as default ones.
* | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Gravatar Jie Luo2018-02-09
| | | | | | | | | | | | | | | | | | | | * 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_benchmarkGravatar Yilun Chong2018-02-09
|\ \ \ \ \ | | | | | | | | | | | | Sync internal benchmark changes
| * | | | | Sync internal benchmark changesGravatar Yilun Chong2018-02-09
| | | | | |
* | | | | | Remove stray indent on normal imports.Gravatar Thomas Van Lenten2018-02-08
| | | | | |
* | | | | | Merge pull request #4288 from nico/nofallGravatar Feng Xiao2018-02-08
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
* | | | | | Fix up the docs to mention the WKTs generated files also.Gravatar Thomas Van Lenten2018-02-07
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #4277
| * | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Gravatar Nico Weber2018-02-07
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #4259 from Mizux/masterGravatar Feng Xiao2018-02-02
|\ \ \ \ \ | | | | | | | | | | | | Various CMake Update
* \ \ \ \ \ Merge pull request #4257 from davido/support_java9Gravatar Feng Xiao2018-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bazel: Support building with Java 9
* \ \ \ \ \ \ Merge pull request #4265 from BSBandme/upgrade_benchmark_submoduleGravatar Yilun Chong2018-02-01
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Upgrade benchmark submodule
| | | * | | | | Use NEW behaviour for project VERSION variables.Gravatar Corentin Le Molgat2018-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
| | | * | | | | Even with MSVC enable zlib support as default behaviour.Gravatar Corentin Le Molgat2018-02-01
| | | | | | | |
| | | * | | | | Add CMake ALIAS targetsGravatar Corentin Le Molgat2018-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject
| | | * | | | | Add VERSION property to CMake library targetsGravatar Corentin Le Molgat2018-02-01
| | | | | | | |
| * | | | | | | upgrade submoduleGravatar Yilun Chong2018-02-01
| | | | | | | |
* | | | | | | | Merge pull request #4266 from brunokim/patch-1Gravatar Jisi Liu2018-02-01
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix link markup in third party list.
| * | | | | | | Fix link markup in third party list.Gravatar Bruno Kim Medeiros Cesar2018-02-01
|/ / / / / / /
* | | | | | | Merge pull request #4239 from mrpi/masterGravatar Adam Cozzette2018-01-31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Create std::string in Arena memory
| | * | | | | | Bazel: Support building with Java 9Gravatar David Ostrovsky2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Work around strange error with atomic and swift under Xcode 8.3.3.Gravatar Thomas Van Lenten2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Haven't been able to make a repo case, but this should "fix" the problem by avoid it completely. - Move readOnlySemaphore_ into the .m file so it isn't exposed in any header. - Move GPBGetObjectIvarWithField() also to go with the new limited visibility on the readOnlySemaphore_.
* | | | | | | | Don't assume c-strings are 4 byte aligned.Gravatar Thomas Van Lenten2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Undefined Behavior sanitizer flags one part of the unittests for this. For default values for `bytes` we write a length on the front of a c-string in the static data, apparently the compiler/linker doesn't always make this 4 byte aligned, so it get flagged for undefined/degraded performance. Avoid this by using memcpy instead.
* | | | | | | | Fix to use "nil" instead of "NULL" for objc objects.Gravatar Thomas Van Lenten2018-01-31
| | | | | | | |
* | | | | | | | Work around the static analyzer false report.Gravatar Thomas Van Lenten2018-01-31
| | | | | | | |
* | | | | | | | Add casts to removed undefined behaviors around shifts.Gravatar Thomas Van Lenten2018-01-31
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4246 Fixes #4247
* | | | | | | Merge pull request #4249 from nlochschmidt/patch-1Gravatar Feng Xiao2018-01-30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Propose kotlinx.serialization as 3rd party lib
* | | | | | | | Move kokoro macOS builds to to Xcode 9.1.Gravatar Thomas Van Lenten2018-01-30
| | | | | | | |
| | * | | | | | Fix -fpermissive: '<::' cannot begin a template-argument listGravatar Ludger Sprenker2018-01-30
| | | | | | | | | | | | | | | | | | | | | | | | '<:' is an alternate spelling for '['.
| * | | | | | | Propose kotlinx.serialization as 3rd party lib Gravatar Niklas Lochschmidt2018-01-30
|/ / / / / / / | | | | | | | | | | | | | | Has support for protobuf v2.
* | | | | | | Merge pull request #3825 from ras0219-msft/patch-1Gravatar Jisi Liu2018-01-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Vcpkg to C++ installation instructions for Windows
| * | | | | | | Add Vcpkg to C++ installation instructions for WindowsGravatar Robert Schumacher2018-01-29
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes issue #1154 by noting that `vcpkg` contains protobuf. Potential improvements: also remark how to use `vcpkg` to get dependencies when building from source via CMake.
* | | | | | | Merge pull request #4196 from mathstuf/cmake-private-target-sourcesGravatar Adam Cozzette2018-01-29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | cmake: privately add sources to targets
* \ \ \ \ \ \ \ Merge pull request #4240 from davido/generate_warning_free_java_codeGravatar Feng Xiao2018-01-29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Java: Generate warning free code
* \ \ \ \ \ \ \ \ Merge pull request #4209 from acozzette/using-statementsGravatar Adam Cozzette2018-01-29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed using statements from common.h
| | * | | | | | | | Java: Generate warning free codeGravatar David Ostrovsky2018-01-27
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Partially fixes #4230.