aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 {}.
* 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.
| * | | Fix link markup in third party list.Bruno Kim Medeiros Cesar2018-02-011-1/+1
|/ / /
* | | Merge pull request #4239 from mrpi/masterAdam Cozzette2018-01-311-4/+2
|\ \ \ | | | | | | | | Create std::string in Arena memory
| * | | Fix -fpermissive: '<::' cannot begin a template-argument listLudger Sprenker2018-01-301-1/+1
| | | | | | | | | | | | '<:' is an alternate spelling for '['.
| * | | Create std::string in Arena memoryLudger Sprenker2018-01-241-4/+2
| | | |
* | | | Work around strange error with atomic and swift under Xcode 8.3.3.Thomas Van Lenten2018-01-313-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Thomas Van Lenten2018-01-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Thomas Van Lenten2018-01-313-5/+5
| | | |
* | | | Work around the static analyzer false report.Thomas Van Lenten2018-01-311-0/+6
| | | |
* | | | Add casts to removed undefined behaviors around shifts.Thomas Van Lenten2018-01-316-11/+11
| |/ / |/| | | | | | | | | | | Fixes #4246 Fixes #4247
* | | Merge pull request #4249 from nlochschmidt/patch-1Feng Xiao2018-01-301-0/+1
|\ \ \ | | | | | | | | Propose kotlinx.serialization as 3rd party lib
| * | | Propose kotlinx.serialization as 3rd party lib Niklas Lochschmidt2018-01-301-0/+1
| | | | | | | | | | | | Has support for protobuf v2.
* | | | Move kokoro macOS builds to to Xcode 9.1.Thomas Van Lenten2018-01-301-1/+1
|/ / /
* | | Merge pull request #3825 from ras0219-msft/patch-1Jisi Liu2018-01-291-0/+10
|\ \ \ | | | | | | | | Add Vcpkg to C++ installation instructions for Windows
| * | | Add Vcpkg to C++ installation instructions for WindowsRobert Schumacher2018-01-291-0/+10
|/ / / | | | | | | | | | 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-sourcesAdam Cozzette2018-01-291-1/+1
|\ \ \ | | | | | | | | cmake: privately add sources to targets
| * | | cmake: privately add sources to targetsBen Boeckel2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | Public sources get added to dependencies of the target as well which can cause duplicate symbols.
* | | | Merge pull request #4240 from davido/generate_warning_free_java_codeFeng Xiao2018-01-292-0/+30
|\ \ \ \ | | | | | | | | | | Java: Generate warning free code
| * | | | Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
| | | | | | | | | | | | | | | | | | | | Partially fixes #4230.
* | | | | Merge pull request #4209 from acozzette/using-statementsAdam Cozzette2018-01-2938-151/+146
|\ \ \ \ \ | |/ / / / |/| | | | Removed using statements from common.h
| * | | | Removed using statements from common.hAdam Cozzette2018-01-2638-151/+146
|/ / / / | | | | | | | | | | | | | | | | | | | | 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-1Feng Xiao2018-01-261-1/+0
|\ \ \ \ | | |_|/ | |/| | Remove broken link to code.google.com/p/protorpc
| * | | Remove broken link to code.google.com/p/protorpcLeigh McCulloch2018-01-251-1/+0
|/ / / | | | | | | 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/builtsourcesFeng Xiao2018-01-251-4/+4
|\ \ \ | | | | | | | | Remove the use of BUILT_SOURCES
| * | | Remove the use of BUILT_SOURCESFeng Xiao2018-01-241-4/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'.
* | | Update .NET SDK to 2.0.3Jon Skeet2018-01-253-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1Feng Xiao2018-01-251-0/+2
|\ \ \ | | | | | | | | Add Haskell implementations
| * | | Add Haskell implementationsMatt Chan2018-01-241-0/+2
| | | | | | | | | | | | Add Awake Security's Haskell Protobuf and GRPC implementations
* | | | Add an explicit import of stdatomic.h.Thomas Van Lenten2018-01-254-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Thomas Van Lenten2018-01-251-0/+6
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #4224 from davido/drop_java_6_supportFeng Xiao2018-01-242-4/+4
|\ \ \ | |/ / |/| | Drop java 6 support
| * | Drop java 6 supportDavid Ostrovsky2018-01-252-4/+4
|/ / | | | | | | Fixes #4220.
* | Merge pull request #4205 from xuwei-k/patch-2Feng Xiao2018-01-231-1/+1
|\ \ | | | | | | fix typo in FieldMaskTree.java comment
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 16:19:08 +0000