aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add github issue templatesissuetemplatesFeng Xiao2018-06-193-0/+53
|
* Merge pull request #4306 from oniksan/upadate-thirdpartyFeng Xiao2018-06-181-0/+1
|\ | | | | Update third_party.md
| * Update third_party.mdOleg Malyavkin2018-02-131-0/+1
| | | | | | Add GDScript Protobuf implementation
* | Merge pull request #4626 from robhancocksed/masterFeng Xiao2018-06-1813-39/+39
|\ \ | | | | | | Declare some generated C++ methods as static #4602
| * | Declare some generated C++ methods as static #4602Robert Hancock2018-05-1413-39/+39
| | | | | | | | | | | | | | | This avoids compile warnings when compiling generated code with the -Wmissing-declarations option.
* | | Merge pull request #2121 from mazurkin/issue-2108Feng Xiao2018-06-185-22/+44
|\ \ \ | | | | | | | | issue-2108 [protoc/Java] Excessive copying on buildPartial()
| * | | [issue-2108] [protoc/java] Excessive copying on buildPartial()Nickolay Mazurkin2016-09-185-22/+44
| | | |
* | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707)medinandres2018-06-181-1/+1
| | | | | | | | | | | | * proto_writer.h: RenderBytes is an override. Marking it.
* | | | Merge pull request #4739 from asimshankar/tf-bytesizeFeng Xiao2018-06-181-1/+5
|\ \ \ \ | | | | | | | | | | Graceful failure in SerializeToArray().
| * | | | Graceful failure in SerializeToArray().Asim Shankar2018-06-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/tensorflow/tensorflow/issues/19657 for motivation. But long story short, without this change: m.SerializeToArray(buffer, m.ByteSizeLong()); would result in a CHECK failure if m.ByteSizeLong() returned a value >2GB.
* | | | | Merge pull request #4760 from dslomov/fix-buildfile-referencesFeng Xiao2018-06-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update build file locations.
| * | | | | Update build file locations.Dmitry Lomov2018-06-131-2/+2
|/ / / / / | | | | | | | | | | | | | | | Fixes https://github.com/bazelbuild/bazel/issues/5383.
* | | | | Merge pull request #4755 from xfxyjwf/fix_benchmarks_linkYilun Chong2018-06-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix incorrect link.
| * | | | | Fix incorrect link.Feng Xiao2018-06-111-1/+1
| | | | | |
* | | | | | Merge pull request #4748 from cmclean/masterFeng Xiao2018-06-121-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make proto_api target visible
| * | | | | | Make proto_api target visibleCory McLean2018-06-111-0/+1
| | | | | | |
* | | | | | | Merge pull request #4758 from dslomov/patch-1Feng Xiao2018-06-121-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Migrate to supported version of http_archive
| * | | | | | Fix typoDmitry Lomov2018-06-121-1/+1
| | | | | | |
| * | | | | | Migrate to supported version of http_archiveDmitry Lomov2018-06-121-1/+2
|/ / / / / / | | | | | | | | | | | | Fixes #4727.
* | | | | | Merge pull request #2811 from Dunemaster/masterFeng Xiao2018-06-111-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Java: Mark sun.misc dependency as optional
| * | | | | | Mark sun.misc dependency as optionalVasiliy Kudryavtsev2017-03-091-0/+1
| | | | | | |
* | | | | | | Merge pull request #3901 from wijagels/masterFeng Xiao2018-06-112-28/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix unused parameter warnings in generated code with arenas enabled
| * | | | | | | Stop unused parameter warnings for generated code in RegisteredArenaDtorWilliam Jagels2017-11-162-28/+28
| | | | | | | |
* | | | | | | | import inspect (#3507)cclauss2018-06-111-0/+3
| |_|/ / / / / |/| | | | | | | | | | | | | Inspect is used five times on line 65-74 without being imported.
* | | | | | | Merge pull request #4725 from ThomasColthurst/patch-2Feng Xiao2018-06-091-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Remove cycle in dependency graph
| * | | | | | Remove cycle in dependency graphThomas Colthurst2018-06-041-1/+0
| | | | | | |
* | | | | | | Align Bazel on Windows with CMake's MSVC flags (#4720)Loo Rong Jie2018-06-051-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Align Bazel on Windows with CMake's MSVC flags
* | | | | | | Update code to work for Xcode 10b1 (#4729)Sergio Campamá2018-06-055-10/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update code to work for Xcode 10b * Update README and test scripts to mention that Xcode 7 is no longer supported
* | | | | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_pluginYilun Chong2018-06-047-46/+356
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add proto2 to proto3 util
| * | | | | | FixYilun Chong2018-06-043-29/+36
| | | | | | |
| * | | | | | Add proto2 to proto3 utilYilun Chong2018-05-307-46/+349
| | | | | | |
* | | | | | | Merge pull request #4698 from ThomasColthurst/proto_c_apiFeng Xiao2018-06-036-1/+148
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfa
| * | | | | | | Introduce Proto C API; based on cl/198113115 by amauryfaThomas Colthurst2018-05-306-1/+148
| | | | | | | |
* | | | | | | | Merge pull request #4714 from dcarp/reference_protobuf_dFeng Xiao2018-06-031-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add reference to protobuf-d
| * | | | | | | | Add reference to protobuf-dDragos Carp2018-06-021-0/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/dcarp/protobuf-d is a conformance tested proto3 runtime library and code generator for D.
* | | | | | | | Remove js_embed binary. (#4709)Feng Xiao2018-06-016-161/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove js_embed binary.
* | | | | | | | Merge pull request #4710 from jtattermusch/upport_4706Adam Cozzette2018-06-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Upport to master: Require C++11 and pass -std=c++11
| * | | | | | | | Require C++11 and pass -std=c++11Adam Cozzette2018-06-011-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the Autotools build to require a C++11 compiler and explicitly pass -std=c++11. This seems to be necessary for enabling C++11 support in older compilers.
* | | | | | | | Merge pull request #4703 from acozzette/thread-safety-annotationsAdam Cozzette2018-05-311-3/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added Clang thread-safety annotations in mutex.h
| * | | | | | | | Added Clang thread-safety annotations in mutex.hAdam Cozzette2018-05-301-3/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Clang's thread safety analysis (-Wthread-safety) to pass without warnings, we need to annotate WrappedMutex to indicate that Lock() acquires the lock and Unlock() releases it. This CL adds the annotations and guards them with an ifdef to make sure they're a no-op on compilers other than Clang. This is a cherry-pick of a change I already made to the Google-internal codebase.
* | | | | | | | Merge pull request #4676 from acozzette/update-changelog-scriptAdam Cozzette2018-05-301-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updated generate_changelog.py
| * | | | | | | | Updated generate_changelog.pyAdam Cozzette2018-05-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I removed references to javanano, since that implementation no longer exists. While I was at it I found a couple places where it looked like the wrong directory was used by mistake and I fixed them.
* | | | | | | | | Merge pull request #4643 from acozzette/merge-3-5-xAdam Cozzette2018-05-300-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge 3.5.x branch into master
| * \ \ \ \ \ \ \ \ Merge branch '3.5.x' into merge-3-5-xAdam Cozzette2018-05-170-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146Feng Xiao2018-04-271-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Using binary one's complement to negate an unsigned int
| | | * | | | | | | | | Using binary one's complement to negate an unsigned intJozef Izso2018-04-271-2/+2
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning C4146: unary minus operator applied to unsigned type, result still unsigned. Original code: https://github.com/google/protobuf/commit/24493eef9395e5b832360e12efabf9c363c9cb15
| | * | | | | | | | | Merge pull request #4398 from pherl/catlog3.5Jisi Liu2018-03-191-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cat the test-suite.log on errors for presubmits
| | | * | | | | | | | | Cat the test-suite.log on errors for presubitsJisi Liu2018-03-191-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Bump version number to 3.5.2v3.5.2Bo Yang2018-03-0513-15/+31
| | | | | | | | | | |
| | * | | | | | | | | Fix setup.py for windows build.Bo Yang2018-03-051-4/+22
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-29 15:45:12 +0000