aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
|
* 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.
| * | | | Removed using statements from common.hGravatar Adam Cozzette2018-01-26
|/ / / / | | | | | | | | | | | | | | | | | | | | These statements pulled a bunch of symbols from the std namespace into the global namespace. This commit removes all of them except for std::string, which is a bit trickier to remove.
* | | | Merge pull request #4229 from leighmcculloch/patch-1Gravatar Feng Xiao2018-01-26
|\ \ \ \ | | |_|/ | |/| | Remove broken link to code.google.com/p/protorpc
| * | | Remove broken link to code.google.com/p/protorpcGravatar Leigh McCulloch2018-01-25
|/ / / | | | | | | Remove broken link to RPC implementation https://code.google.com/p/protorpc/. Going to this URL displays a 404 error message, with no indication that the project has a new location or still exists.
* | | Merge pull request #3934 from xfxyjwf/builtsourcesGravatar Feng Xiao2018-01-25
|\ \ \ | | | | | | | | Remove the use of BUILT_SOURCES
* | | | Update .NET SDK to 2.0.3Gravatar Jon Skeet2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow SourceLink as per #4179, and mean that we can use C# 7.0 language features in the library (but not in generated code). This does not affect which platforms we're *targeting*, so end users won't see any difference. It would be nice to update to 2.1.4, but AppVeyor's "Visual Studio 2017" environment is only 2.0.3.
* | | | Merge pull request #4226 from themattchan/patch-1Gravatar Feng Xiao2018-01-25
|\ \ \ \ | | | | | | | | | | Add Haskell implementations
* | | | | Add an explicit import of stdatomic.h.Gravatar Thomas Van Lenten2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated code for enums needs atomics support, so generate the import instead of relying on it via transitive imports. This will make future changes to this likely likely to break generated code and runtime support are mixed. Followup to https://github.com/google/protobuf/pull/4184.
* | | | | Bring back import of OSAtomic.Gravatar Thomas Van Lenten2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to https://github.com/google/protobuf/pull/4184, keep the import to not break any existing generated code that isn't regenerated when they update to the newer protobuf code.
| * | | | Add Haskell implementationsGravatar Matt Chan2018-01-24
|/ / / / | | | | | | | | Add Awake Security's Haskell Protobuf and GRPC implementations
* | | | Merge pull request #4224 from davido/drop_java_6_supportGravatar Feng Xiao2018-01-24
|\ \ \ \ | | | | | | | | | | Drop java 6 support
| * | | | Drop java 6 supportGravatar David Ostrovsky2018-01-25
|/ / / / | | | | | | | | | | | | Fixes #4220.
| * / / Remove the use of BUILT_SOURCESGravatar Feng Xiao2018-01-24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3912 [BUILT_SOURCES](https://www.gnu.org/software/automake/manual/html_node/Sources.html) is used with [Automake's automatic dependency tracking](https://www.gnu.org/software/automake/manual/html_node/Dependencies.html#Dependencies) but doesn't work well in protobuf when cross-compiling. Their presence causes maek to always generate them even when they are not requested and as a result causes cross-compilation to fail because the built protoc cannot be used to generate unittest protos (see: https://github.com/google/protobuf/issues/3912). Removing it with explicit dependencies fixes the build issue when running 'make', 'make all', 'make install' at cross-compilation. It doesn't affect 'make protoc' because BUILT_SOURCES only works for the implicit targets 'all', 'check' or 'install'.
| | * Create std::string in Arena memoryGravatar Ludger Sprenker2018-01-24
| |/ |/|
* | Merge pull request #4205 from xuwei-k/patch-2Gravatar Feng Xiao2018-01-23
|\ \ | | | | | | fix typo in FieldMaskTree.java comment
* | | Migrate away from deprecated OSAtomic APIs. (#4184)Gravatar Jonathan Dierksen2018-01-22
| | | | | | | | | | | | * Migrate away from deprecated OSAtomic APIs.
| * | fix typo in FieldMaskTree.java commentGravatar kenji yoshida2018-01-22
|/ /