aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Fixed up proto3_lite_unittest.ccGravatar Adam Cozzette2018-03-14
|
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
| * Merge pull request #4378 from acozzette/node-bufferGravatar Adam Cozzette2018-03-13
| |\ | | | | | | Revert "Removed mention of Buffer in byteSourceToUint8Array"
| * \ Merge pull request #4167 from mike9005/patch-1Gravatar Joshua Haberman2018-03-13
| |\ \ | | | | | | | | Ruby: Fix scope resolution for MessageExts
| * \ \ Merge pull request #4380 from mateuszmatejczyk/patch-1Gravatar Jisi Liu2018-03-12
| |\ \ \ | | | | | | | | | | Output *_pb2_grpc.py files when use_grpc_plugin=True
| * \ \ \ Merge pull request #1333 from cgull/pkg-config-issueGravatar Jisi Liu2018-03-12
| |\ \ \ \ | | | | | | | | | | | | Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
| | | * | | Output *_pb2_grpc.py when use_grpc_plugin=TrueGravatar Mateusz Matejczyk2018-03-11
| | |/ / / | |/| | | | | | | | Start outputting missing *_pb2_grpc.py files when use_grpc_plugin is set to True for py_proto_library.
| | | | * Revert "Removed mention of Buffer in byteSourceToUint8Array"Gravatar Adam Cozzette2018-03-09
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f00e06c95bc117fb2ed0ca56c96041c93039f1fe. Although Node Buffers are not covered by the tests, it seems that there are users relying on them, so we need to add back in support for them. This fixes issue #4359.
| * | | Merge pull request #4347 from xfxyjwf/pluginpbGravatar Feng Xiao2018-03-09
| |\ \ \ | | | | | | | | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
| * \ \ \ Merge pull request #4375 from jo2y/protoc-defaultGravatar Feng Xiao2018-03-09
| |\ \ \ \ | | | | | | | | | | | | Replace //:protoc and similar default macro arguments with
| | * | | | Replace //:protoc and similar default macro arguments withGravatar James O'Kane2018-03-08
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @com_google_protobuf prefixed versions. This allows them to work in 3rd party repositories. Fix a bad visibility rule. :hidden does not exist, but :private does.
| * | | | Sync upb change (#4373)Gravatar Paul Yang2018-03-08
| | | | |
| * | | | Convert descriptortype to type for upb_msgval_sizeof (#4357)Gravatar Paul Yang2018-03-06
| | | | |
| * | | | For encoding upb needs descriptor type instead of type. (#4354)Gravatar Paul Yang2018-03-06
| | | | |
| * | | | Merge pull request #4355 from acozzette/typoGravatar Adam Cozzette2018-03-05
| |\ \ \ \ | | | | | | | | | | | | PHP: fixed typo in message.c
| | * | | | PHP: fixed typo in message.cGravatar Adam Cozzette2018-03-05
| |/ / / /
| | * / / Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Gravatar Feng Xiao2018-03-01
| |/ / / | | | | | | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
| * | | 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
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 14:54:09 +0000